fixed broken test
Add basic multi-site operation and some starter templates
PEP8