Update to using cmake 3.1