CMake manages optional deps better
Merge branch 'dev_lwk3' of github.com:lwinkler/markus into dev_lwk3

Conflicts:
	CMakeLists.txt
Manage opt deps in CMake