Fixed: for Mac OS X
Fixed: for Mac OS X
Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/vimrc_plugins
	zsh/zprofile