Added post install and update commands to composer.json

Composer should now set the appropriate permissions for the storage directory on install and update.
Fixed merge conflict in composer.json