Mostly Gemfile work and fix rspec spec.

Mostly Gemfile work (upgrades, etc) and fix rspec spec.