add rbenv settings
update settings
Merge branch 'master' of github.com:jldbasa/dotfiles

Conflicts:
	tmux
1) update alias
2) add heroku zsh plugin