Merge pull request #30 from asgrim/master

Updated composer.phar
Minor edits reflecting recent changes
Merge branch 'master' of github.com:asgrim/phph-site