Merge pull request #357 from code-dot-org/test

DTP
Merge pull request #361 from code-dot-org/staging

[11/06/2014] DTT
test.rb merge conflict
Merge branch 'test' of github.com:code-dot-org/code-dot-org into test
Mailing lists.
Build system changes for Chefized varnish.
Merge branch 'production' into test
Merge branch 'test' into staging