.
Merge branch 'master' of github.com:brieb/vim

Conflicts:
	vimrc