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

Conflicts:
	_vimrc