Clean up display on git symbols, add history to right prompt

Resubmitting this after squashing a bunch of commits.