nit! whitespace, folding
wip! neaten up our remote ref massaging section
use a '/' between remote name and remote branch if local and remote names differ

...happens sometimes; may as well make it as least confusing as possible! :\