Add composer.lock to git, so we can be sure of versions.
When we run the build process the composer.lock will of course be ignored, as that would be annoying for users.
Remove config.php as that gets put there by the installer
Merge branch '2.3/develop' of git://github.com/pyrocms/pyrocms into 2.3/develop