small changes
Merge branch 'master' of https://github.com/TyOverby/.vim

Conflicts:
	.vimrc