[Reviewer: Graeme] Clearwater-seagull

Graeme, can you please review these changes to clearwater-seagull? 

The master branch is the import from svn - I've added integration with build-infra in this branch. 
This alignment looks weird, shouldn't this just be on the line above?