Some tidying and rearranging.

vimrc: Fix colour detection for gnome-terminal. Tidy. Prepare for nvsimple.