cleaned up cmaker
fixed merge conflicts
-G to --config
Merge pull request #15 from scopatz/cm

Further CMaker Improvements
Merge ManifestParsing changes with upstream/master