moved composer stuff into master branch