CMake 2.8.7

Require CMake 2.8.7 and, cleanup and fixes for the build system