Implement missing pubsub commands and fix indentation
Remove unnecessary imports
Merged with master
Remove unnecessary Builder and fix merge issue. Fixes #520
Change pubSub to pubsub
Merge pull request #523 from xetorthio/pubsub

Add pubsub commands