Updated cmake
Merge branch '0.2' of https://github.com/sanguinariojoe/ocland into 0.2