Fix bugs in README.md and shortlog.tmpl