Behavior fixes
Store behavior settings by model
Merge pull request #3 from kriskd/master

Behavior fixes