Merge branch 'master' of https://github.com/jbgit/dotnfiles

Conflicts:
	.gvimrc
	.vimrc
Merge branch 'master' of https://github.com/jbgit/dotnfiles