Set the restore_state and restore_events flags to the appropriate defaults
Merge branch 'master' into pjfranalysis
Made temporary fixes to MultiDict and AttrDict
Readded curve_dict initialization code