Add email (and tokenized email parts) to dictionary only when non-nil
Merge pull request #5 from gabrielg/master

Add email (and tokenized email parts) to dictionary only when non-nil