Merge branch 'master' into fix-numpy-1.12

.travis.yml

@@ -0,0 +1,19 @@
+language: python
+python:
+#  - "2.6"  # 2.6 does not have collections.OrderedDict
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.5-dev" # 3.5 development branch
+  - "3.6"
+  - "3.6-dev" # 3.6 development branch
+  - "3.7-dev" # 3.7 development branch
+  - "nightly" # currently points to 3.7-dev
+# command to install dependencies
+install: "pip install -r requirements.txt"
+install: "pip install nose"
+install: "sh get_testdata.sh"
+# command to run tests
+script: nosetests

requirements.txt

@@ -0,0 +1 @@
+numpy