Partial sort of aliases.
Updating git config to be forward-compatible with git 2.0.