Merge "bugfix: leverage data_files to stop hacking setup.py"