chchchchanges.
Merge branch 'master' of github.com:romainl/dotvim

Conflicts:
	vimrc

done