Fixed up CMake for win32
merge
Fixed compile for OS X
merge
merged heads
Merged heads