Better separation of kata types

Cleaner distinction between SBE and simple TDD kata structure in
Makefile rather than one size fits all
Some tidyup of the C++ snippets
Merge branch 'feature/bootstrap' into develop