install grep
NeoBundleUpdate
Merge branch 'master' of github.com:hereticreader/.vim

Conflicts:
	bundle/.neobundle/install_info