Turned on RF amps.  Output should now be around 2 watts
TEST
Merge from Matt's source
Merge remote-tracking branch 'upstream/master'