Count merge commits in git when checking differences with tracking remote branch
Fix mark prefix

Now the prompt mark can be at the beginning
of a new line without a space before it.

Conflicts:
	liquidprompt