setting vimrc
Merge branch 'master' of ssh://github.com/iwag/dotfiles

Conflicts:
	home/brewfile