initial commit from
Merge branch 'master' of http://github.com/syllogismos/vim

Conflicts:
	_vimrc
update _vimrc