Fix data_files to hopefully work on mac
Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.py
Remove files added by our editors