Refactor
Merge branch 'develop'

* develop:
  Refactor

Conflicts:
	nerdtree_plugin/git_status.vim