Merge branch 'robby-master' into master

Conflicts:
	.gitignore
	oh-my-zsh.sh
	plugins/rbenv/rbenv.plugin.zsh