Merge pull request #45 from eile/master

Build and tclap tweaks
Merge branch 'master' of https://github.com/Eyescale/Collage
Fix Bamboo build