Re-added nerdtree using pathogen
Merge branch 'master' into xfce4