PSR-2 refactor, first pass
2nd pass for various bits missed by auto fixer
Merge pull request #8 from moltin/feature/psr-2

Moving to PSR-2, thanks @outrunthewolf. Closes #1