Refactoring

[imalsogreg]

Hey Blair,

I like this structure. I think I'd like to try to start hacking on the threaded-discussions feature. Can I pull in the refactoring branch first?

Or should I go ahead from master, and we'll worry about merging later?