Merge pull request #188 from DanielPlainview/master

OnPHP meets Composer
Merge branch 'onphp-1.0' into 1.0-for-colvir