Gemfile and Rakefile cleanups