Updates for PSR2
Merge pull request #21 from stanlemon/almost-psr2

Updates for PSR2