May have fixed line wrapping issue with tput.  Now just using regular ANSI escapes within a function.  Hope that fixes it.  Also added git string to PS1