site modifications to make it...ya know...work
Merge branch 'site'