Small grammar fix. :eyes: .
Merge pull request #2044 from jonathanmarvens/master

Tiny grammar fix...[:)].
Adding a few things to the composer.json file.
Fix package name.
pull upstream master and fix merge conflicts in composer.json