Merge branch 'master' of http://github.com/katycain526/centerforopenscience.org into communities-addition

# By Katy Cain
# Via Katy Cain
* 'master' of http://github.com/katycain526/centerforopenscience.org:
  Katy's Changes
removed spaces
enable tab linking, add content
Communities blurbs
Merge branch 'communities-addition' of http://github.com/jlcohoon/centerforopenscience.org

Conflicts:
	www/communities.mako
	www/involved_opportunities.mako
Merge branch 'master' of https://github.com/KatyCain526/centerforopenscience.org
more journal content
Merge branch 'master' of https://github.com/mckidwell/centerforopenscience.org into communities-addition

# By Mallory Kidwell
# Via Mallory Kidwell
* 'master' of https://github.com/mckidwell/centerforopenscience.org:
  created Developer page content, added erica's new picture, fixed RPP learn more link

Conflicts:
	www/involved_opportunities.mako
Merge branch 'master' of http://github.com/katycain526/centerforopenscience.org into communities-addition

# By Katy Cain
# Via Katy Cain
* 'master' of http://github.com/katycain526/centerforopenscience.org:
  Communities blurbs

Conflicts:
	www/involved_opportunities.mako
removed excess content
content updates
Merge branch 'communities-addition' of https://github.com/jlcohoon/centerforopenscience.org