Merge pull request #5 from nubs/master

Make mergeReport more fun and fix some portability issues.
Improve logging.
Only count files that have lines.
Make logging a bit more useful.
Swap around git checkouts to reduce # of checkouts needed.
Add one more line of logging.
Don't skip null merge hash.
Ignore phtml too.

We eventually want to do something like this, but we have to find a way
to make it work and not require ugly indentation.