Merged codebased deployment

Changes to merged codebase needed for deployment.
There's also a lot of references directly to the /content_ms/files/ bucket. If we merge/change the S3 file it's pointing to those will have to change as well. 

I'm not too thrilled that the location isn't a variable for those in the first place, so I'd really like to think long and hard about if/what we want to replace those instances with.