.travis.yml fixes

Contains fix for #4

Also contains general .travis.yml fixes