remove server override in jerusalem
Merge branch 'master' into gh-pages