WIP entity rename logic
use a check lookup that covers all checks seen
rake tasks for entity reparent, untested as yet
Entity#merge for assimilation of orphaned data
uncomment code
Merge branch 'master' into 599_rename_state_with_entity
rework Entity#add to better express actual code paths
distinguish between 'all' and 'enabled' entities
minor cleanup
entities:repatriate rake task
rename a spec
Merge pull request #600 from flapjack/599_rename_state_with_entity

Rename state with entity, and reparent orphaned entity data