updates
Merge branch 'master' of github.com:rupa/.vim

Conflicts:
	vimrc