Fix .gitmodules
Add Nerdtree
Merge branch 'master' of https://github.com/mnilsson/dotfiles

Conflicts:
	.gitmodules
Updater submodule paths
remove php plugins
Add vim-bundler
Readd php.vim