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

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

phenny

@@ -123,7 +123,8 @@ def main(argv=None):
    # Step Two: Check Dependencies
 
    check_python_version() # require python2.4 or later
-   check_dotdir() # require ~/.phenny, or make it and exit
+   if not opts.config:
+      check_dotdir() # require ~/.phenny, or make it and exit
 
    # Step Three: Load The Configurations