Remove ~/.ruby-version if it was accidentally set
Add rubocop to default gems
Allow for running commands as non-root via sudo
Merge commit 'd54fdd2f9bdb5b905b469014dbb05ab4062420e3'

Conflicts:
	bin/ruby-install
	rbenv/default-gems
Update teamocil
Add etrecheck
Remove unneeded flux scripts