rvm -> rbenv
heroku in osx PATH
Merge branch 'master' of github.com:berekuk/etc

Conflicts:
	bash/main