FishLight_PCB: Add some more PU I2C resistors

The I2C bus is pretty long in a few places so I am adding some
additional pull ups on the end of the 2 branches.  I also moved a few
things and made some wires a bit bigger.
FishLight_PCB: Fix some merge issues

I tried messing with the synced commits and things
broke.  This is a fix of those issues.

Signed-off-by: Michael Loptien <loptienm@gmail.com>