several updates
Merge branch 'master' of github.com:xpac27/dotfiles

* 'master' of github.com:xpac27/dotfiles:
  add rbenv loading

Conflicts:
	.zshrc