working towards a more sane way of setting the defaults for each site
make the sites actually load their defaults
Merge branch 'master' into aaf_auth