Merge pull request #1036 from gavinandresen/pubsubcleanup