added nerdtree to vim
default to simple push style in git
Merge branch 'master' into dogmatix

simplified git push
nerdtree in vim