Formatting updates for PSR-1 and PSR-2

Ran php-cs-fixer on things.
Updated header comments.
Merge pull request #23 from tedivm/formatting

Formatting updates for PSR-1 and PSR-2