Block rendering with borders

Re-integrate code that draws border outlines on rendered blocks so we can tell when blocks of the same color are stacked vertically.