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

DTP
Merge branch 'test' into production
Merge branch 'test' into production
Merge pull request #52 from code-dot-org/staging

DTT
Merge pull request #58 from code-dot-org/staging

DTT
Merge branch 'staging' into test
Merge branch 'test' into production
Hotfix: Properly disable caching for workshop management page.
Trigger production build.
Developer instructions should either be step-by-step, so that they can debug the individual steps that are broken, or they should be integrated directly into the `rake install` task such that it can be run reliably everywhere. Adding a Brewfile moves us away from the unified install model.
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Merge branch 'test' into staging
Better RBENV instructions
hotfix process forms to upload the workshop progress snapshot to S3 instead of trying to store it in the db
Merge branch 'production' of github.com:code-dot-org/code-dot-org into production
Merge production
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Automatically built.

commit 0e748e045e9fc9faa18f3f63eb9456eedc9cde6d
Merge: 71999f9 e56bf64
Author: Continuous Integration <dev@code.org>
Date:   Mon Sep 29 21:16:04 2014 +0000

    Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging

commit e56bf640f6541ef2642a53ae20e988b8e9623fc8
Merge: e899f3d 95a3f4d
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Mon Sep 29 14:15:49 2014 -0700

    Merge pull request #61 from code-dot-org/blocklySvgFramed

    move frame logic into separate class
Better RBENV instructions

things kind of working, with hackery

clean things up a little