PHPCS cleanup

Should all errors except in the DI package.

P.S. Whoever wrote the unit tests clearly didn't try that hard to meet the
standards :P
Fix a couple of DI things
Merge pull request #213 from wilsonge/master

PHPCS cleanup