PSR-2 compliance and PHPDoc formatting (manual pass)
Merge pull request #102 from gigablah/psr-tweak

PSR-2 compliance and PHPDoc formatting (manual pass)