Merged .vimrc from mpb

Conflicts:
	.vimrc