Bug 134 add cell blacklist

Implement cell blacklisting, plus a little bit of cleanup along the way.