Branch checked to see if not trunk and shown accordingly.
Merge remote branch 'upstream/master' into 354
Merge pull request #399 from arjclark/354

354: rosie go: auto-displaying the branch field