Travis CI and docs
Refactor listeners