Manually merges revisions from @bnosek
Merge branch 'redesign' of https://github.com/CenterForOpenScience/centerforopenscience.org into redesign