Terminator

Merge proposals dependent on lp://staging/~dechandler10/terminator/fix_custom_commands_dialog

  1. fix_custom_commands_dialog
  2. Dependent merge proposals

lp://staging/~dechandler10/terminator/fix_custom_commands_dialog has no merge proposals.