Did a lot of things, including getting mailers to work properly locally
Fixed merge conflicts with edit and delete