git and vim changes