Add git aliases and settings; alphabetize; spaces not tabs