unite/vimproc
Merge branch 'master' of https://github.com/j3parker/dotfiles

Conflicts:
	install
	vimrc