Cleanup PHP
Cleanup settings
Merge pull request #7 from jonathantneal/php-cleanup

Cleanup PHP & settings