Merge branch 'graingert-master'

.travis.yml

@@ -0,0 +1,20 @@
+language: python
+python:
+  - 2.6
+  - 2.7
+  - 3.4
+matrix:
+  allow_failures:
+    - python: 3.4
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install nodejs
+install:
+  - npm install -G socket.io@0.9
+  - pip install -U --use-mirrors requests
+  - pip install -U --use-mirrors six
+  - pip install -U --use-mirrors websocket-client
+before_script:
+  - node serve-tests.js
+  - sleep 1
+script: nosetests

README.md

@@ -26,9 +26,9 @@ Activate isolated environment.
     VIRTUAL_ENV=$HOME/.virtualenv
     source $VIRTUAL_ENV/bin/activate
 
-Launch the your socket.io server.
+Launch your socket.io server.
 
-    node serve_tests.js
+    node serve-tests.js
 
 For debugging information, run these commands first.