Add two more plugins and remap NERDTree shortcut.
Merge master.