Coding style fixes
Merge pull request #26 from GrahamCampbell/psr-2

PSR-2 Coding Style