fixed git branch issue and re-added dircolors