Restored travis build, cleaned up .travis.yml