resolve conflict

Author: alimanfoo

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "c-blosc"]
 	path = c-blosc
-	url = git@github.com:Blosc/c-blosc.git
+	url = https://github.com/Blosc/c-blosc.git

.travis.yml

@@ -0,0 +1,14 @@
+language: python
+
+python:
+  - 2.7
+  - 3.4
+  - 3.5
+
+install:
+  - pip install -U pip setuptools setuptools_scm wheel
+  - pip install -U nose -rrequirements.txt
+  - python setup.py build_ext --inplace
+
+script:
+  - nosetests -v

MANIFEST.in

@@ -1,2 +1,3 @@
 recursive-include c-blosc *
 recursive-include zarr *.pyx
+include cpuinfo.py

README.rst

@@ -7,6 +7,9 @@ Python.
 * Source code: https://github.com/alimanfoo/zarr
 * Download: https://pypi.python.org/pypi/zarr
 
+.. image:: https://travis-ci.org/alimanfoo/zarr.svg?branch=master
+    :target: https://travis-ci.org/alimanfoo/zarr
+
 Installation
 ------------