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

Further CMaker Improvements
collect test project changes from PR #16
Merge branch 'TestProject' of https://github.com/msarahan/PyCMake into TestProject