Refactor Christopher's patch.
Merge remote-tracking branch 'upstream/master'
[Craigslist.org] Exclude blog
Re-adding in UI changes from nullishzero