Update the managed object model code

I was having problems getting the project to run - it seemed to be
attempting to load the model from elsewhere. Using this static method
will merge all the models available within the main bundle.
Refactored the delete all code a little bit

Bit of repetition I couldn't resist
Merge pull request #1 from sammyd/master

CoreData fix & a little bit of refactoring