slightly improve logic for merge-only commits
fix typo
Merge branch 'travis' of github.com:/dlapiduz/clouseau into travis