Merge branch 'develop'
fixing travis, for good
Merge branch 'master' into develop
updating MANIFEST