Allow custom mail headers
Merge branch 'master' of github.com:evanmiller/ChicagoBoss