New aliases and vimdiff config