Update composer.json
Tweak to .gitignore
Minor fixes in docblock and code to comply with PSR-2 coding standards