Merge everything

Merge all the branches we have open.

This includes the pre-meeting odin.local code, the python-3 compatibility code, the refactorings and renamings discussed at the meeting, and a bunch of fixes to make all of that work together.