Rails 3.2.13
bundle update rspec rspec-rails
Merge heroku master into github master

Fixes a change that occured where heroku master had updated Gemfile
while master branch at rubyrogues/rubyfriends did not