remove php::ini - conflicts
add check for php::cli already defined.
rename port var to php-fpm for consistency
fix static patter causes issues w/ non-php apps
Merge branch 'pahoughton-devel' into pahoughton-test