Update 10.17.2013 0948

CMakeLists.txt:		Corrected a few compile options so now all is working.