Cleanup, preparing for extending the system outside content
Merge branch 'master' of https://github.com/arkona/content