Issue #13: Tidy up, remove debug comments, formatting.
Issue #13: Tidy up, remove debug comments, formatting.

MattClarkson/CMakeCatchTemplate,MattClarkson/CMakeCatchTemplate,MattClarkson/CMakeCatchTemplate,MattClarkson/CMakeCatchTemplate