Using simple uniform initialization syntax rather than unneeded ATOMIC_VAR_INIT
Removed extra line in CMakeLists
General tweaks to CMakeLists