added gitconf alias, fixed PS1 colors