Uncolour the Git branch display in PS1

Looking at the Git PS1 display, it seems to have the ability to set its
own colour codes, depending on the current situation of the repository
(e.g. if there are conflicts).  Stop colouring it explicitly so it can
colour itself instead.
Merge branch 'master' of git://github.com/me-and/dotfiles