minor code style tweaks
fixes #299 we now check for missing branch.$branch.merge header before trying a pull too - in addition to the remote.origin.url #385