Updating to rails 3.1 ActionMailer API