Clean up travis file and cache gems
Merge pull request #205 from alphagov/travis-update

Clean up travis file and cache gems