[PATCH 0/6] Vim additions and cleanup