#25: Better logic and cleanup
Merge pull request #105 from kalabox/travis-again

#25: Better logic and cleanup