Clean up email notification message
Merge pull request #14 from ncloudioj/master

Clean up email notification message
inferno retry functionality
Merge branch 'mkhaitman' of https://github.com/chango/inferno into mkhaitman

Conflicts:
	inferno/lib/pid.py