Clean cmake junk
For Alex
Merge pull request #1 from chutsu/master

CHECK!