Cmake cleanups...
Merge branch 'master' of github.com:gerstrong/Commander-Genius