moving pins around to match the Due pin availablility
more cleanup on the 2.1 board