* master:
  correct email config hash options
  minor updates, submitting two PRs as one
  put the pencil to graphite
  touch up email doc