various small changes
Merge branch 'master' of git://github.com/giuliop/vim

Conflicts:
	vimrc