Removes references to model_file, and model is created on each call to renderer
Fixes broken tests
Removes test that's not needed anymore
Move order of model creation parameters, and tidied up the model inclusion logic
Merge pull request #28 from BBC-News/remove-model-file

Remove references to 'model_file', getting model name from template name