Fixing moved paths after refactoring static packaging approach
Revert "Fixing moved paths after refactoring static packaging approach"

This reverts commit 24236b031e499b55dcf2839ca308d4cfd0698bc5.
Revert "Adding a 'merge' setting to cfstatic instances to configure how often a merge check will occur"

This reverts commit 46c0043f59990a88547b7210c72d627bc8ad6c7c.
Revert "Reshuffling the static assets system so that there are independent cfstatic instances for both the admin and the website (+ an arbitrary number of any other instances the developers may wish to configure"

This reverts commit c34e5d0168aa2bedebe6ddc2b5071d663760995b.