Allow site setup to run on existing directories in www
Merge branch 'directories' into develop