cleanup
Merge branch 'master' of https://github.com/clobrano/my-vim-config

Conflicts:
	.vimrc