Replaced Makefile with CMakeLists.txt. Updated .gitignore.
Added cmake module to locate PHP5.
Merged master fixed conflict.