huge non-backwards compatible changes. including script that converts from old data to new data formats. New features. Bug fixes.
merge