Update prompt.
WIP: add git upstream changes count
Add terminator config
Merge