correctly remove main.cpp
Change valgrind target to accept multiple binaries
Merge branch 'cmake_build' into develop