various vimdc cleanups