Updated a method name in the .h, but not the .m
Add unit test to verify the blocking behavior.
Remove the blocking code
Work around a bug in the mergeChangesFromContextDidSaveNotification:
Merge pull request #36 from Raizlabs/bugfix/KingOfBrian/PartialRename

Remove Test Code
Merge branch 'develop' into bugfix/KingOfBrian/MultiContextIssue
Wrap the workaround in a #define and update the comments