Use NERDTreeToogle instead of just NERDTree
Merge branch 'master' of https://github.com/aepifanov/.vim

Conflicts:
	vimrc