adding git branch parsing and slight changes to prompt