More vim config tweaks and alias fixes