Pulling in cmake and devtest changes

no warnings on my end and files display in a nice tree in Xcode.