Add context-sensitive action and clean up new vim module