Fixes.
Merge branch 'master' of http://github.com/gconnell/vimrc

Conflicts:
	vimrc