Pull changes from Modcloth.com

I am going to fix the email mechanism.