Made git prompt provide GitPrompt rather than taking over PS1.
Externalized colors and symbols for ahead or behind commits.
Fixed the rest of the colors.
Made ahead and behind colors and symbols actually work.
Removed a bunch of commented out stuff that I don't want.