.
Merge branch 'master' of https://github.com/glenntam/g-vimrc

Conflicts:
	.vimrc
oops