new vimrc
Merge branch 'master' of github.com:WnP/Arch-conf

Conflicts:
	.vimrc