Update ,e mapping to fully convert should to expect syntax
Alias diff to colordiff
Add alias for merge (m)