add vimproc make options
Merge branch 'master' of github.com:2k0ri/dotfiles
pre-merge from K-OSX
Merge branch 'afn'

Conflicts:
	.vimrc
	oh-my-zsh_custom/go.zsh
add .tmux.conf
Merge branch 'master' into afn