Ensure that package_data is correct and the MANIFEST.in is correct
Ensure that our packaging remains correct
Merge pull request #2074 from dstufft/fix-packaging

Fix packaging