Added SMTP Collector and its client
Fixed clashing with builtin stmts
Added first e-mail test, modified ip_echo service
Commenting
Handling multiple payloads
Fixed merge artifact
Renamed the cfme_data section
Some slight refactor to have faster tests