Upgrade rails and rspec

and other minor changes