Pull the last minute changes back into develop

We made a bunch of last minute changes and bug fixes directly in master at the time of release. Let's pull those changes back down here.

I'll self-approve this one if no one else looks at it. We know master works... I think :D