Unify Chaos, Hyper, and Classic History

Awhile back we ran 1-minute (chaos) and 15-minute (hyper) ticks on 2 different servers. The data is still there, but needs to be merged into the regular account history.