Lots of various refactoring.

At this point of broken Auditor but it will soon be revived with a
cleaner API and much cleaner templating. The hacks I did to get
this thing up and running for hackweek are paying me back but I will
push through!