More config tweaks and cleanup.
More tweaks to vimrc to sort out plugins.