Merged CMake tree

FindLunchbox wasn't working correctly (the system installed version was preferred over the installed at  LUNCHBOX_ROOT). Pulling the CMake tree fixed it.