Merge pull request #1 from Humbedooh/master

Pull in 0.6.1 changes from humbedooh/pypubsub