please dont wrap me
add wrap
Merge branch 'master' of github.com:zjrosen1/vim

Conflicts:
	vimrc
clean up and added some thangs