Minor change in how website config is setup
Merge remote-tracking branch 'origin/master'