Upgrade to mail 2.5.4

This gem has a dependency on an old version of the mail gem. I have set it to the latest version available to resolve conflicts.