Update highlighter keywords
Drastically improve git-status branch parsing