Speed up travis testing, possibly
Update travis scripts
Merge pull request #106 from robotmay/travis-speed

Speed up travis testing, possibly