Add acts_as_cushion functionality and test it
Fix Gem-based test failures and add Code Climate coverage.
Stuff model from JSON non-recursively
Merge branch 'master' of github.com:chemica/velvet-cushion
Merge branch 'develop'