Merge branch 'master' into remove_resweb

Author: Matt George

.travis.yml

@@ -2,7 +2,7 @@ language: python
 python:
   - "2.6"
   - "2.7"
-  - "pypy"
+#  - "pypy"
 # command to install dependencies
 install:
   - pip install -r requirements-test.txt --use-mirrors