updated entity to use activatable model. All places that used delete now use delete with force=True
updated docs
fixed merge conflict
Merge pull request #54 from wesleykendall/feature/activate

Entities are activatable models
Update version.py