replace RVM with RBENV
Merge branch 'master' of github.com:davelens/software

Conflicts:
	install_rails_stack.sh