Be more selective with NSNotification removals
Merge pull request #2 from civatrix/NSNotifications

Be more selective with NSNotification removals