heroku needs the ruby version
fix blog link
Merge branch 'master' into heroku
don't store user requests when the request errors
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
add newrelic
Merge branch 'master' into heroku
Merge branch 'master' into heroku
JSON pretty_generate doesn't like ASCII sometimes
Merge branch 'master' into heroku
Revert "JSON pretty_generate doesn't like ASCII sometimes"

This reverts commit caccec54a634d5129b8cb8eba31790cedecd0cf9.
Merge branch 'master' into heroku
use thin for the webserver
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku

Conflicts:
	Gemfile.lock
Merge branch 'master' into heroku