Changed NERDTree to CtrlP, added surround