Strip out OAuth, add email output format
Tidy the interface a fair bit