Merge https://github.com/sbp/phenny

Conflicts:
	modules/head.py
	modules/wikipedia.py

modules/tell.py

@@ -123,6 +123,7 @@ def message(phenny, input):
    tellee = input.nick
    channel = input.sender
 
+   if not os: return
    if not os.path.exists(phenny.tell_filename): 
       return