update rails
Add psych gem
Upgrade rubysl
hmmm
Upgrade rubinius
Don't use psych
Add racc gem
Add 12 factor
Bump rubinius version
Merge branch 'master' into upgrade

Conflicts:
	Gemfile
	Gemfile.lock