Updates Heroku gem

See
http://stackoverflow.com/questions/11837379/updating-heroku-gem-on-rvm-osx-has-resulted-in-a-loaderror-and-broken-hero
Updates rails to 3.1.11 (latest today)
Updates mocha to kill warnings
Merge branch 'release/2013-02-26-r2'