Update AD2SmartThings_ArduinoMega_Sketch

This should sync a couple features into one commit.