Cleanup - Autoformatting

Applies a bunch of autoformatting (and a bit of manual code groking) toward getting civilint to pass.

It still doesn't, but I confirmed at least php -l passes afterward :)