cleanup
resolved conflict on wpt configs merge
Added the default httpd.conf
Added the default php.ini
Added a checkpoint to verify the domain
resolved conflict
heat template clean up
Merge branch 'master' of https://github.com/hdansou/webpagetest

Conflicts:
	heat/webpagetest-private-single.yaml
Merge pull request #50 from hdansou/master

Added the php.ini and httpd.conf