Simplify travis.
Merge pull request #125 from whatthejeff/simplify_travis

Simplify travis.