master: adding templates for inserting doubleunderscore into different contexts, updates to 3rd party scripts