WIP
Merge branch 'master' into persistor
options hash for models
WIP
WIP
params moved to persistor system
clean
move params spec
WIP
WIP
WIP
WIP
WIP
WIP
WIP
inc ver