Update stats_consulting.mako
Correct ZIP in footer address
Update about_team.mako

Add specific role ahead of each intern description.
Added QC/QA/Test Engineer Intern position, closes #168
Merge pull request #164 from AndrewSallans/patch-20

Update stats_consulting.mako
Merge pull request #165 from erinspace/team

Small adjustments to the about team page
Merge pull request #167 from lyndsysimon/zip

Correct ZIP in footer address
Merge branch 'AndrewSallans-patch-21'

Conflicts:
	www/about_team.mako
Merge pull request #170 from erinspace/jobs

Added QC/QA/Test Engineer Intern position, closes #168
Merge branch 'master' of https://github.com/CenterForOpenScience/centerforopenscience.org into team