Feature/public updates

This merges in all of the public updates to date. I have tested this on my machine and it works. We should merge to develop, QA it, and then merge to master.
@Tapjoy/opsautomation