Merge pull request #78 from chrisisonwildcode/master

Pulling in cmake and devtest changes
Merge pull request #6 from Mindwerks/master

updating my source