Add --no-merges option to git-changelog

Let people skip merges when generating changelog.
It also merges part of #102 (multiple args parsing for changelog). If you still want to take #102 it now should be trivial to merge.