Disable automatic NERDTree, vimdiff cmdhieght

* NERDTree is not automatically invoked or closed anymore.
* Increase cmdheight in diff mode to avoid nasty "Press ENTER to
continue..." prompt.