Merge branch 'master' of github.com:hujo/vimfiles

	vimrc
Merge branch 'master' of github.com:hujo/vimfiles

Conflicts:
	vimrc
update