Merge proposals dependent on lp:~mhr3/zeitgeist/refactoring

lp:~mhr3/zeitgeist/refactoring has no merge proposals.