More cmake defaults
Merge pull request #577 from joshimhoff/master

Cmake stuff one more time