Package test data together with the tests package
Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.py
clean up imports