Always merge with commit, in case merge has been set to rebase by default
Merge pull request #135 from Yelp/merge_never_rebase

git merge --no-rebase in case git global has been set to rebase on merge