add git diff colour and new push/pull aliases