Ugh, can't figure out how to make these merge.

Once again I've screwed myself by trying to push too many changes at one time.  Some big changes here, but I'm not sure where the merge conflict is, or how to resolve it in this case.