Mostly Gemfile work and fix rspec spec.

Mostly Gemfile work (upgrades, etc) and fix rspec spec.
Ask the boss ;o). I'm just a worker bee...