Updated Grunt script, patched a couple of PubSub bugs