preliminary deletion of unneccesary things
Merge branch 'master' into hintss
travisci