Merge branch 'develop'
new go & nerdtree
Merge branch 'develop'

* develop:
  new go & nerdtree
simplify
Merge branch 'master' of https://github.com/Xuyuanp/vimrc into simple

Conflicts:
	vundles/go.vim
	vundles/nerdtree.vim