Some clean-up and stubbing.
Merge branch 'master' of https://github.com/gsbodine/plugin-Entities