Changing output handler mechanism to be compliant with PSR-0 autoloaders.
Fixing merge issue in app.php