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

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

Conflicts:
	vimrc