bring master up-to-date with develop branch

Going to land a pull request for the first time in umpteen years (and, no, it's not this one), so getting this project back to sanity.  Will make `master` the default branch for the repository now.