Consolidate/fix up NERDTree, Ack