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

PSR-2 Coding Style