yep
Merge branch 'master' of https://github.com/pbhemphill/dotvim

Conflicts:
	vimrc