Update composer.json
Merge branch 'develop' of git://github.com/spiffyjr/spiffy-assetic-package into develop