remove deprecated devise options
add .rvmrc
Update rails to 3.2 stable and pg

So I can run this locally
ruby 2.1.0
Don't allow blank mojis
wait

Merge branch 'master' of heroku.com:kaomojiworld

Conflicts:
	Gemfile
	Gemfile.lock