Bring master up-to-date with a bunch of changes

[ndw]

I've been remiss, apparently, in making PRs back to master. This is an attempt to rectify that oversight. This is all the changes through 0.0.17 plus a few small things that will be in 0.0.18.