Merge branch 'master' of https://github.com/sbp/phenny

Conflicts:
	irc.py
	modules/oblique.py
	modules/startup.py

modules/oblique.py

@@ -43,6 +43,8 @@ def service(phenny, input, command, args):
     lines = bytes.splitlines()
     if not lines: 
         return phenny.reply("Sorry, the service didn't respond any output.")
+    try: line = lines[0].encode('utf-8')[:350]
+    except: line = lines[0][:250]
     phenny.say(lines[0][:350])
 
 def refresh(phenny): 

modules/startup.py

@@ -58,11 +58,12 @@ def startup(phenny, input):
 
     if hasattr(phenny.config, 'password'): 
         phenny.msg('NickServ', 'IDENTIFY %s' % phenny.config.password)
-        __import__('time').sleep(5)
+        time.sleep(5)
 
     # Cf. http://swhack.com/logs/2005-12-05#T19-32-36
     for channel in phenny.channels: 
         phenny.write(('JOIN', channel))
+        time.sleep(0.5)
 startup.rule = r'(.*)'
 startup.event = '251'
 startup.priority = 'low'