add bootstrap_rbenv function
some more aliases
Merge branch 'master' of https://github.com/adamcstephens/dotfiles
Merge branch 'master' of https://github.com/adamcstephens/dotfiles

Conflicts:
	shell/generic.sh
shell: add some apt aliases