Generalize adding questions
Some cleanup
Merge stuff
Work on question generalization, make each webmail provider a new client, display a new browser question