Fix warnings about invalid gemspec.

Move the gems added to resolve dependency resolution out of the gemspec
and into the Gemfile.  This prevents warnings being generated by newer
versions of bundler because rails was listed twice in the gemspec.