Added submodules, fixed a few things

.gitmodules

@@ -0,0 +1,15 @@
+[submodule "node_modules/Jerk"]
+	path = node_modules/Jerk
+	url = git://github.com/gf3/Jerk.git
+[submodule "node_modules/node-bitly"]
+	path = node_modules/node-bitly
+	url = git://github.com/tanepiper/node-bitly.git
+[submodule "node_modules/node-github"]
+	path = node_modules/node-github
+	url = git://github.com/ajaxorg/node-github.git
+[submodule "node_modules/node-spotify"]
+	path = node_modules/node-spotify
+	url = git://github.com/peol/node-spotify.git
+[submodule "node_modules/ntwitter"]
+	path = node_modules/ntwitter
+	url = git://github.com/AvianFlu/ntwitter.git

modules/bitly.js

@@ -1,5 +1,5 @@
 var functions = require('../functions'),
-    Bitly = require('node-bitly').Bitly,
+    Bitly = require('node-bitly'),
     urlp = require('url'),
     hollabacks,
     bitly;
@@ -31,15 +31,13 @@ bitly = module.exports = {
         this._sh = socialhapy;
 
         var credentials = socialhapy.config.modules.bitly;
-
         this._bitly = new Bitly(credentials.user, credentials.token);
-
         functions.extend(socialhapy.watchers, this.watchers);
     },
 
     createLink: function(url, hollaback) {
-        this._bitly.shorten(url, function(result) {
-            if ( !result.data.url ) {
+        this._bitly.shorten(url, function(err, result) {
+            if ( err || !result.data.url ) {
                 console.log('*** Warning: bit.ly module encountered an error while shortening a link: ' + result.status_txt);
             }
 

socialhapy.js

@@ -59,13 +59,18 @@ function initialize() {
     config.irc.channels = functions.unique( ircChans );
 
     // Connect to IRC
-    Jerk(function(jerk) {
-        socialhapy.jerk = jerkInstance = jerk; 
+    (function() {
+        var staticJerk = Jerk(function(jerk) {
+            socialhapy.jerk = jerkInstance = jerk; 
 
-        for (o in watchers) {
-         	functions.addWatcher( jerkInstance, watchers[ o ] );
-        }
-    }).connect( config.irc );
+            for (o in watchers) {
+             	functions.addWatcher( jerkInstance, watchers[ o ] );
+            }
+        })
+        .connect( config.irc );
+
+        jerkInstance.say = staticJerk.say;
+    })();
 }
 
 initialize();