Update composer.json

Reorder things a bit.  This should basically add composer installation compat