a few mods
Merge branch 'master' of https://github.com/codelahoma/dot_vim

Conflicts:
	vimrc