Bring master back up to speed with develop

Just leaving this here for a little bit as a summary of all that's changed.

We're working on this project infrequently enough that it might just make sense to start developing right against master and tagging releases when the project is 'stable'