Small xmonad and vim fixes