- CMake version reduced to plain 2.8.0
Merge branch 'master' into map_changes

- Guh.  Merge in CMake changes.