Adding colordiff
Adding various tweaks, more aliases