changes to pubsub
Merge branch 'server' of github.com:omgitstom/tvnexthack into server