Integrate CMake subtree through gitexternals
Improvements based on James D. review
Merge pull request #65 from eile/master

Improvements based on James D. review