Merge upgrades

This pull request addresses issue #65

Added support for commit messages (-m) and fast-forward only enforcement (--ff-only) to git merge.
This work is still in progress, I had to push my changes up to work from a different machine.  I expect the tests to fail at this point.  (Because the merge is a fast forward, it won't have the expected commit message.)