Bit more work on rebaser, merging object changes. Not finished.
Bit more work on rebaser, merging object changes. Not finished.

ChronicStim/ensembles,ChronicStim/ensembles,realmacsoftware/ensembles,drewmccormack/ensembles,realmacsoftware/ensembles,drewmccormack/ensembles