Improved clarity of user@host and git branch/state