Merge branch 'master' of https://github.com/KatyCain526/centerforopenscience.org
Merge branch 'communities-addition' of https://github.com/jlcohoon/centerforopenscience.org
Merge branch 'communities-addition' of https://github.com/jlcohoon/centerforopenscience.org
created buttons for journals tab on the opportunities page
fixed merge conflicts
fixed links, added grants
allow linking to grants, fix links
add project manager and coordinator jobs
Merge pull request #247 from erinspace/jobs

add project manager and coordinator jobs
Merge branch 'master' of https://github.com/CenterForOpenScience/centerforopenscience.org into staging
Merge branch 'communities-addition' of https://github.com/jlcohoon/centerforopenscience.org into staging
some hp updates
Merge branch 'communities-addition' of https://github.com/jlcohoon/centerforopenscience.org into staging