Simplified and updated composer.json
Merge branch 'master' of https://github.com/cygnite/framework

# Via Cygnite PHP Framework
* 'master' of https://github.com/cygnite/framework: