Merge pull request #255 from code-dot-org/staging

staging -> test
Revert Code.org_infographic.png
Merge pull request #257 from code-dot-org/test

Production push
Fix edge cases blocking emails from sending
Merge branch 'test' into staging