Close vim if all that's left is NERDTree
Merge branch 'master' into hyfn

Conflicts:
	.vimrc