--- a/autobot/template.py	Tue Apr 15 21:27:32 2014 -0700
+++ b/autobot/template.py	Tue Apr 15 21:37:18 2014 -0700
@@ -15,14 +15,8 @@
 from projects import descriptions
 from projects import factories
 from StringIO import StringIO
+from subprocess import check_call as call
 
-try:
-    from subprocess import check_call as call
-except ImportError:
-    from subprocess import call
-
-# default OS type
-os_type = mozinfo.os
 
 def print_descriptions():
     """print factory descriptions"""
@@ -47,7 +41,7 @@
             Variable('htmlport', 'port for waterfall display', default=8010, cast=int),
             Variable('publichtmlport', 'port for public waterfall display', default=8011, cast=int),
             Variable('botname', 'name of IRC bot', default='autobot-test'), # use autobot in production
-            Variable('ircHost', 'IRC host', default='irc.mozilla.org'),
+            Variable('ircHost', 'IRC host'),
             Variable('ircChannels', 'channels for the IRC bot ("-" for none)', default='#ateam-test'), # use #ateam in production
             Variable('domain', 'autobot domain name', default='localhost'),
             Variable('recipients', 'email recipients for all projects', '')
@@ -203,6 +197,7 @@
 
         return variables, output
 
+
 ### console_script front-ends
 
 def create_master(args=sys.argv[1:]):
@@ -222,4 +217,5 @@
     cli(*args)
 
 if __name__ == '__main__':
+    # default: create master
     create_master()