Upgrade to Rails 3
Specify Ruby version for Heroku
Add procfile for heroku
Fix Procfile
Duh. Actual Procfile format, rather than copied and pasted
Merge branch 'master' of heroku.com:squeaker

Conflicts:
	.rvmrc
	Gemfile
	Gemfile.lock