Merge no edit

From http://git-scm.com/docs/git-merge
The `--no-edit` option can be used to accept the auto-generated message (this is generally discouraged).

`merge_branch` is only used for merging the main branch into a feature branch.
Although generally discouraged it prevents the extra step of having to close the editor.
I have not ran into the case where I would edit the message.