fixed git ps1 colors and giff alias
Merge branch 'master' into necromancer