Trying a new vim rc
Merge branch 'master' of https://github.com/echochamber/MyVimAndBashrc

Conflicts:
	.vimrc