Coding style fixes
More coding style fixes
More fixes
Merge pull request #52 from GrahamCampbell/psr-2

PSR-2 Coding Style