Aggregate branches to master

[iontom]

Let's merge our branches soon and push to the master so we can start working fresh again.

This should include "tom" which is an offshoot of "max" with "dev" which features Aaron's API work