Mostly Gemfile work and fix rspec spec.

Mostly Gemfile work (upgrades, etc) and fix rspec spec.
Oh LocationsHelper doesn't exist. I think it got auto-generated here. Do you think the spec still needs to be here if the class isn't?