Simplify .travis.yml a bit
Merge pull request #145 from rightscale/travis_simplification

Simplify .travis.yml a bit