Bug fix + --no-merge

• Fixes a date formatting bug
• Adds the --no-merge flag for ignoring merge commits
  Thank you @plicjo for those PRs!