A few tweaks while looking over the top level entry point
Merge pull request #52 from travis-ci/minor-tweaks

A few tweaks while looking over the top level entry point