Autoload
PSR-1 and PSR-2 compliance (thanks, php-cs-fixer)
Merge