Merge branch 'release/2.0.8' into develop
Updating changelog
Re-Added obtaining permanent ids automatically
Minor formatting updates
Pass errorCallback through convenience method
Merge pull request #322 from tonyarnold/develop

Pass errorCallback through convenience method
Merge branch 'master' into develop
fix formatting in changelog
Merge pull request #327 from heatherm/master

Fix formatting of changelog
Implement new save methods
Update existing save tests to reflect save changes. Also begin adding tests for deprecated methods to ensure consistent behaviour in unmodified code.
Fix compilation problems under latest Xcode.
Update gitignore and remove user specific xcuserdata
Add Kiwi for saner asynchronous testing and remove existing GHUnit tests for save methods
Flesh out tests for MagicalRecord+Actions and the NSManagedObjectContext+MagicalSaves category
The deprecated saveWithBlock: method should do it's work on the current thread
All deprecated and non-deprecated methods have tests to ensure their function
Update README with details of the changes in this branch
Update shorthand methods and import the magical saves category so that MRSaveCompletionHandler resolves
Merge branch 'hotfix/save-changes-for-2.1' into develop

Conflicts:
	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
	Project Files/Magical Record.xcodeproj/project.pbxproj