snapshot.... this shit is broken
Merge branch 'master' into socket.io_cluster

Conflicts:
	node_modules/socket.io/History.md
	node_modules/socket.io/Readme.md
	node_modules/socket.io/lib/manager.js
	node_modules/socket.io/lib/socket.io.js
	node_modules/socket.io/lib/socket.js
	node_modules/socket.io/lib/static.js
	node_modules/socket.io/lib/transport.js
	node_modules/socket.io/lib/transports/flashsocket.js
	node_modules/socket.io/lib/transports/http-polling.js
	node_modules/socket.io/lib/transports/http.js
	node_modules/socket.io/lib/transports/jsonp-polling.js
	node_modules/socket.io/lib/transports/websocket/default.js
	node_modules/socket.io/lib/transports/websocket/hybi-16.js
	node_modules/socket.io/node_modules/policyfile/package.json
	node_modules/socket.io/node_modules/redis/README.md
	node_modules/socket.io/node_modules/redis/changelog.md
	node_modules/socket.io/node_modules/redis/examples/simple.js
	node_modules/socket.io/node_modules/redis/generate_commands.js
	node_modules/socket.io/node_modules/redis/index.js
	node_modules/socket.io/node_modules/redis/lib/parser/hiredis.js
	node_modules/socket.io/node_modules/redis/lib/parser/javascript.js
	node_modules/socket.io/node_modules/redis/lib/queue.js
	node_modules/socket.io/node_modules/redis/lib/util.js
	node_modules/socket.io/node_modules/redis/multi_bench.js
	node_modules/socket.io/node_modules/redis/package.json
	node_modules/socket.io/node_modules/redis/test.js
	node_modules/socket.io/node_modules/redis/tests/reconnect_test.js
	node_modules/socket.io/node_modules/socket.io-client/History.md
	node_modules/socket.io/node_modules/socket.io-client/bin/builder.js
	node_modules/socket.io/node_modules/socket.io-client/dist/socket.io.js
	node_modules/socket.io/node_modules/socket.io-client/dist/socket.io.min.js
	node_modules/socket.io/node_modules/socket.io-client/lib/events.js
	node_modules/socket.io/node_modules/socket.io-client/lib/io.js
	node_modules/socket.io/node_modules/socket.io-client/lib/socket.js
	node_modules/socket.io/node_modules/socket.io-client/lib/transport.js
	node_modules/socket.io/node_modules/socket.io-client/lib/transports/htmlfile.js
	node_modules/socket.io/node_modules/socket.io-client/lib/transports/jsonp-polling.js
	node_modules/socket.io/node_modules/socket.io-client/lib/transports/websocket.js
	node_modules/socket.io/node_modules/socket.io-client/lib/transports/xhr-polling.js
	node_modules/socket.io/node_modules/socket.io-client/lib/transports/xhr.js
	node_modules/socket.io/node_modules/socket.io-client/lib/util.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/active-x-obfuscator/node_modules/zeparser/package.json
	node_modules/socket.io/node_modules/socket.io-client/node_modules/active-x-obfuscator/package.json
	node_modules/socket.io/node_modules/socket.io-client/node_modules/uglify-js/package.json
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/.travis.yml
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/History.md
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/Makefile
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/README.md
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/bin/wscat
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/examples/fileapi/server.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/examples/serverstats/package.json
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/examples/serverstats/public/index.html
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/examples/serverstats/server.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/lib/BufferPool.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/lib/BufferUtil.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/lib/ErrorCodes.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/lib/Receiver.hixie.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/lib/Receiver.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/lib/Sender.hixie.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/lib/Sender.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/lib/Validation.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/lib/WebSocket.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/lib/WebSocketServer.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/node_modules/commander/History.md
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/node_modules/commander/Readme.md
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/node_modules/commander/lib/commander.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/node_modules/commander/package.json
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/node_modules/options/package.json
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/package.json
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/src/bufferutil.cc
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/src/validation.cc
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/test/Receiver.hixie.test.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/test/Receiver.test.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/test/Sender.hixie.test.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/test/WebSocket.test.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/test/WebSocketServer.test.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/test/testserver.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/xmlhttprequest/README.md
	node_modules/socket.io/node_modules/socket.io-client/node_modules/xmlhttprequest/package.json
	node_modules/socket.io/node_modules/socket.io-client/node_modules/xmlhttprequest/tests/test-constants.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/xmlhttprequest/tests/test-headers.js
	node_modules/socket.io/node_modules/socket.io-client/package.json
	node_modules/socket.io/node_modules/socket.io-client/test/socket.test.js
	node_modules/socket.io/package.json
snaphost redisStore
snapshot
RedisRegistry working w/ mocha tests
RedisEventPublisher + tests
Merge branch 'master' into socket.io_cluster

Conflicts:
	lib/socket.js
snapshot
fixed ns to allow for string keys that contain "." characters
added ns test
got REDIS-backed distributed channels working; moved channel setup for tests into app startup
removed troublesome groups stuff from channels
bugfix addChannel wrapper to return channel
remove socket.io backup directory
Merge pull request #163 from ryedin/master

lots of REDIS action...