Update to PSR-4 autoloading
Merge branch 'psr4'