Added the php.ini and httpd.conf

fix few merge conflicts as well.