Updated schematic to simplify SPI bus layout on PCB.  More work on PCB layout.