Merge pull request #96 from dklempner/pollset_kick

Factor out the pollset kicking mechanism and eliminate sharding