Various vim updates/cleanup