git and vim additions