Merge aaronc/spec

Aaronrequested to merge
aaronc/spec into master

This stuff is getting ready to go back into master - lots of work on spec, CI and testing.

Edited by Aaron

Merge request reports