Better variables names
Fix git status coloring in prompt for git v2.0
Code format
Local-independent HEAD..oeirign divergence check