Update README.md
Update .travis.yml
Update .travis.yml
Merge pull request #186 from redaxmedia/develop

Develop into Master
Update composer.json
Update package.json
Merge pull request #187 from redaxmedia/master

Master to Develop