Adding vimrc
Adding vimrc to install
Merge branch 'master' of https://github.com/it0a/dotfiles

Conflicts:
	.zshrc