Merge from develop to master

This stuff is all tested. Let's get it to master so that we can start using it on my deploy tomorrow.
@Tapjoy/opsautomation