Alias and vim changes...mostly