Merge branch 'max' of github.com:antonbarty/cheetah into max
Add the new boost dependencies
Merge branch 'max' of github.com:antonbarty/cheetah into max
Merge branch 'max' into testing