Install nerdtree bundle as a submodule.
Merge branch 'master' of https://github.com/jaramago/dot-vim

Conflicts:
	.gitmodules