git simple and vim fix