Add vinegar, disable NERDTree
Resolve merge