Revert "fixes pre race-ethnicity reconcile."

This reverts commit 7bf9f80b247e2ebe69907ff9499aecea129c14d2.
Revert "Revert "fixes pre race-ethnicity reconcile.""

This reverts commit c1200a3a08123a8ce46692a9a4b851d647f154d9.
Race Ethnicity Collapse.
Base tests passing.
Added demographics tests, demos complete.
Resolved merge conflicts?
Merge pull request #15 from amida-tech/matt-demographics-new

Matt demographics new