Tidy up after core refactor
First round of content delivery specific functions broken out

Functions will eventually form part of octofish
Using underscore to extend the core object and include additional functionality