Update composer.json
Tweak to .gitignore
Minor fixes in docblock and code to comply with PSR-2 coding standards
Whoops
Merge pull request #14 from shrikeh/master

Fixes for full CodeSniffer PSR-2 compliance