Merge branch 'master' of https://github.com/okcompute/VimScripts

Conflicts:
	vimrc
Merge branch 'master' of https://github.com/okcompute/VimScripts