Minor spec clean up
Rename observe/unobserve to add_observer/remove_observer
Some slight code cleanup
Model persistence is now set when first used