Branch/reset blockly

@scottnc27603 @eric79  These are the fixes I needed for the scenario switching & resetting. Please review.