Fix issue where single word branch desc is doubled

A branch description of 'test' would show up as 'test test' because of
improper substring removal. Fix this and remove the resulting double
spacing when there is no description tail.