Fixed default handling to get back assets
Added handling for docroot of files so that they can live ina  relative loaction, not just the default /sites/all etc, but in /docroot/sites/all...
Removing a previous only if that is not needed.
Fixed merge conflicts