Whitespace and remove more apache cruft.
Add user/category relationship, change model reprs.