Better organized the Gemfile and added mocha and mocha-on-bacon to testing dependencies.