Commit before pulling in Marketing site changes
Merged marketing changes
Removed config/routes.rb.orig and fixed routes.rb