Fix for change to Wealdtech core
Merge pull request #12 from wealdtech/feature/tidy

Tidy-ups for 0.7