Fix exception thrown from user/edit
Eager load all the thingz

Went from 76 queries on the main page to 28. Boom!
More file reorg