Fixed: mac
Merge branch 'master' of github.com:kazufusa/dotfiles

Conflicts:
	vim/vimrc_sets
	zsh/zprofile