Revert "Update rubinius"

This reverts commit 0d317c874a4f0cd3dc7a24dc12bf7b6e0246b8dc.
Revert "Revert "Revert "Upgrade rubinius and puma"""

This reverts commit 04dfb9ade0fb7c5fd41061c5c3363336674663da.
Add psych gem
Upgrade rubysl
hmmm
Upgrade rubinius
Don't use psych
Add racc gem
Add 12 factor
mri
Upgrade some gems
Upgrade devise
Upgrade dev and assets
Use mri for travis
Bump rubinius version
Merge branch 'master' into upgrade

Conflicts:
	Gemfile
	Gemfile.lock
Use new rubinius
Use new rubinius
Merge branch 'master' into rails4

Conflicts:
	Gemfile
	Gemfile.lock
caching gems