Simplified the travis config file a bit.
Merge pull request #822 from whatthejeff/simplify-travis