Merge from develop to master

I just confirmed this on TIAB and it looks good. Ready to move to master. Needs to merge at the same time as https://github.com/Tapjoy/slugforge/pull/180.
@Tapjoy/automation @wjossey