Merge refactor, rename, python 3 compatibility, odin_demo, and odin branches

This is a bunch of merges.  All outstanding branches are merged in this PR.

There were some conflicts that had to be resolved by hand between all of these branches.