Switch Heroku to Ruby 1.9.3
Merge branch 'master' of heroku.com:rollah

Conflicts:
	Gemfile