Fixing some vim annoyances