Travis: add prebuilt cmake 3.1

I got on a Travis VM and built a binary package for the latest version of cmake. Now we can use all the nice functionality. 

* update the commented out code that was only for 2.8.7