Add --no-ff and parameter passing to the merge

As noted at http://nvie.com/posts/a-successful-git-branching-model/:
The --no-ff flag causes the merge to always create a new commit
object, even if the merge could be performed with a fast-forward.
Update the README with the new story-merge behavior
Bump the version number
[#44064519] Restore old code, tests, and script for story-push
[Delivers #44064519] Restore old code, tests, and script for story-push