Switch back to command-t (on the  branch) from my fork.
Update some .vimrc settings.