Display '*' for git dirty state
Use correct grep
Highlight dirname