Change NERDTree toggle shortcut, markdown plugin
Resolve conflicts