Pull in website changes for better dealing with HTML emails, also needed model and settings changes