fix #363
Merge branch 'master' into up/master

Conflicts:
	lib/nerdtree/creator.vim