move e-mail munging outside of html body
index.html roundtripped through lxml
Started adding some new events