Update to add site-name fallback.
Fixing issue with setting not being available.
Merge pull request #550 from weerd/site-name-fallback

Site name fallback