marvel: Add new vocabulary.
imap: try and make tests work from multiple builders at the same time.