Tada
Merge pull request #3 from urfolomeus/patch-1

Tada
link to travis
Update Gemfile
commit the lock, oops
Merge branch 'master' into fix-the-tests