whoa what happened (merge)

package.json

@@ -1,10 +1,14 @@
 {
-  "name": "coffee-resque",
-  "version": "0.1.0",
-  "description": "Coffeescript/Node.js port of Resque",
-  "keywords": ["coffee-resque"],
-  "dependencies": {"redis": ">= 0.5.2"},    
-  "engines" : {"node" : ">=0.2.6"},
-  "directories": {"lib": "lib"},
-  "main": "./lib/index"
+  "name"         : "coffee-resque",
+  "version"      : "0.1.0",
+  "description"  : "Coffeescript/Node.js port of Resque",
+  "keywords"     : ["resque", "redis", "queue", "coffee script"],
+  "homepage"     : "https://github.com/technoweenie/coffee-resque",
+  "author"       : "Rick Olson <technoweenie@gmail.com> (http://techno-weenie.net)",
+  "contributors" : ["Sean McDaniel <sean.mcdaniel@me.com>"],
+  "main"         : "./lib/index",
+  "directories"  : {"lib"  : "./lib"},
+  "repository"   : {"type" : "git",  "url": "https://github.com/technoweenie/coffee-resque.git"},
+  "dependencies" : {"redis": ">= 0.5.2"},
+  "engines"      : {"node" : ">=0.2.6"}
 }

test/worker_wildcard_queues.coffee → test/worker_wildcard_queues_test.coffee

@@ -5,14 +5,15 @@ conn.enqueue 'abc', 'def'
 conn.enqueue 'def', 'ghi'
 
 queues = []
-conn.on 'error', (err, worker, queue) ->
+worker = conn.worker('*')
+worker.on 'error', (err, worker, queue) ->
   queues.push queue.toString()
   if queues.length == 2
     worker.end()
     conn.end()
     assert.deepEqual ['abc', 'def'], queues
 
-conn.worker('*').start()
+worker.start()
 
 process.on 'exit', ->
-  console.log '.'
+  console.log '.'