Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/Xuyuanp/git-nerdtree into develop

* 'develop' of https://github.com/Xuyuanp/git-nerdtree:
  fix CWD string
remove log
Merge branch 'develop'

* develop:
  remove log