Rebuild Analytics plugin to something more generic

(and less goofy...)