Change smartsensor connectors to 2x5 on controller board
Change smartsensor connector to 2x5 on grizzly bear
Minor routing fixes on grizzly and controller.

Edit rqou: Hopefully fixed fun merge problems between this commit
and Andrew Wang's.