Refactored to use generateimage template tag instead of lots of imagespecs on the models to decouple the models from the templates
Merge branch 'refactor-imagekit' into develop