Rolled back Gemfile, and updated dependency for bundler in Rakefile.