Update docs to reflect Composer changes
Merge branch 'docs'