Cleanup branch

Okay, so here is the cosmetic changes only.

I added phpcs to composer in require-dev (composer install --dev), which is an awesome little util to help linting php code. I added a Makefile rule to run it with "make lint". With this patch set applied, it finds no issues.