Don't load rbenv by default.
iTerm2 settings update.
Merge branch 'master' of https://github.com/szywon/dotfiles

Conflicts:
	zlogin-osx