Use Git's `SQUASH_MSG`

Prepend the merge message to the existing `SQUASH_MSG`, which should
keep the squashed commit history intact.
Merge branch 'append-story-id' into preserve-commit-history-on-merge
Fix feature
Merge pull request #9 from mako-taco/preserve-commit-history-on-merge

Preserve commit history on merge