updated gemfile and tests

I'll be using this branch from now on. Don't bother with the tests branch and the pull requests associated with it.