Minor refactor and speed up Travis
Merge pull request #92 from rails-girls-summer-of-code/speed-up-travis

Minor refactor and speed up Travis