reverted the data format change for now, we'll stick to existing data formats until we're ready to deploy the new clients that match the new data formats. Fixed a few new-voter-style related bugs, revealed by loading data from production site.
