Cleaned up homepage marketing containers
Fast-forwarded Heroku branch conflict