Use color for dirtiness of git branch, better vi prompt for native vi mode
Add count for unmerged commits, reduce the number of git command calls
Fix regex for dirtyness
Subdir of git segment is now white
Add new screenshots