add ~/bin to $path
remove unneeded settings in vimrc
Merge branch 'formac'

Conflicts:
	zsh.d/zshenv