Merge commit 'refs/merge-requests/3' of git://gitorious.org/conservancy/website into merge-requests/denver

I originally had those settings that Denver's changed because of a
tutorial I read about handling a sidebar suggested them. I've accepted
Denver's change, but am concerned that some browsers may not work.