Fixed include paths on src/CMakeLists.txt and Demo/CMakeLists.txt to include both include/ and include/chipmunk
Merged in CMake fix