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

DTP
Modified donor_slider files to accomodate 3 platinum donors, and smarter sizing.
Removed special Microsoft case and slightly adjusted aspect ratio of image.
daemon should never be a canonical name
Randomized order of items in donor_slider
Smarter randomization.
Smarter randomization.
Merge branch 'staging' of https://github.com/code-dot-org/code-dot-org into donor_slider_update
Smarter randomization.
Comment update
For email blash.
Pegasus dropbox changes.
Dropbox changes
Merge branch 'production' into test
Revert script string merging change.
Fix for api_change_org api.
Merge branch 'production' into test
Merge branch 'test' into staging
Automatically built.

commit 3baaec6701975350cd92dd9deb6513be73ae4ecd
Merge: d2275b8 2e55a4e7
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Thu Oct 30 14:14:02 2014 -0700

    Merge branch 'production' into test

commit d2275b8ab43162b18eb4142ff464a8174ec0607a
Author: Continuous Integration <dev@code.org>
Date:   Thu Oct 30 21:13:08 2014 +0000

    Dropbox changes

commit aa8d8d881e062d26fc81f758bd003acd6a7fe6e1
Author: Continuous Integration <dev@code.org>
Date:   Thu Oct 30 21:10:49 2014 +0000

    Pegasus dropbox changes.

commit 63d53aaeaf927bbaead327293084ffe87e0667d5
Merge: 53f766b c8a24ae
Author: Continuous Integration <dev@code.org>
Date:   Thu Oct 30 21:03:42 2014 +0000

    Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Restore old Studio->Play Lab string changes.