Use #deliver_now if using Rails 4.2+
Merge pull request #653 from wooly/master

Use #deliver_now if using Rails 4.2+