Travis refactoring & pubsub fixes