sync
Merge branch 'master' of github.com:jnz/dotvim

Conflicts:
	vimrc