Simplify travis.
Merge pull request #87 from whatthejeff/travis_improvements

Simplify travis.