update
Merge branch 'master' of github.com:yayugu/environment

Conflicts:
	home/.vim/bundle/neobundle.vim