Show merge count, in additon to commit count.

To help distinguish a single large merge vs many small ones, a reasonable analogue for unshipped features
Merge branch 'master' into gh-pages

* master:
  Show merge count, in additon to commit count.