Updated parallel controller pin/button mapping
Merge remote-tracking branch 'brandon/master'