conf migration part 1
Merge branch 'wsgi' into HEAD (multisite conf first cut)