Merge branch 'master' of https://github.com/drewmccormack/ensembles
Merge branch 'baselining' of https://github.com/drewmccormack/ensembles
Merge branch 'baselining'
Changed how the CDEMigrator works. It now uses separate NSManagedObjectContexts and PSCs when importing and exporting files. Previously it was adding a new store to the main event store, but this seems to be problematic. It may have been causing the extra events appearing in files.
Merge branch 'baselining'
Magic numbers are the devil :)
Added CDEAvailabilityMacros to define `__IPHONE_7_0` and `__MAC_10_9` when compiling against an older SDK and used it in `CDEIcloudFileSystem`
Merge pull request #86 from evands/less-magic-numbers

Less magic numbers mark II
Added a notification in the CDEICloudFileSystem that is posted when the number of undownloaded files drops to zero. This is a good time to try a merge.
Merge branch 'master' of https://github.com/drewmccormack/ensembles
Added CDEAvailabilityMacros to the Mac framework.
Implemented the CDEPersistentStoreEnsembleDidSaveMergeChangesNotification notification, which can be used to update the main MOC and UI after a merge. The delegate method still exists as well.
Fixed a bug where we were using the revisionNumber instead of globalCount in the CDERebaser.