Further vim changes and addition of aliases