Accept q key for quit & better clearing

Signed-off-by: Andrei Thorp <athorp@evernote.com>