Wrap mapping added
Merge branch 'master' of https://github.com/lxgreen/vim

Conflicts:
	_vimrc