Updated CMakeList to take advantage of CMake 3.1 and it's VS2015 generator, as well as fixed warnings introduced.