Tweaks and updates to vim