PSR-4 and update to Collection 1.2, don't gitignore composer.lock anymore.
Merge branch 'master' into 1.2
Merge branch '1.2'