Add composer.lock and remove from lock file
Merge branch 'develop' of github.com:blongden/hal into develop