Merges removed from stats

Removed merges from stats (this had been done previously, but had a small bug that is now fixed). Git logs do not reliably show merges, so currently no way to count them... need to look into that more.