Most of the data munging done now
Remove code that is subsumed into maker
Tidy up most of the fitting code.

Almost ready to run here.  I've got some big things to fix up around
duplication, and I'd be curious for your thoughts, Matt.