Merge pull request #69 from eile/master

Refactor Barrier API for robustness, deprecate old API
Print help always
Merge pull request #70 from tribal-tec/master

Print help always
Update travis config
Merge branch 'master' of https://github.com/eile/Collage