Use vimdiff when not on Mac.
Handy new bindings.
Close/minimise NERDTree when done with it.
CtrlP configuration.