Minor fixes and vim plugin additions