update ruby
Merge branch 'master' of github.com:Nerian/bootstrap-wysihtml5-rails

Conflicts:
	.rvmrc
Merge branch 'master' of https://github.com/Nerian/bootstrap-wysihtml5-rails