Subproject

These are changes to collage which enable building as a subproject + fixes to boost dependencies found during testing