Merge branch 'develop'

Jesse Myers · Jesse Myers · commit ee27da9a4ac6 · 2015-09-15T08:40:31.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: python
 python:
 - '2.7'
 sudo: false
-install: pip install . --use-mirrors
+install: pip install .
 script: python setup.py nosetests
 deploy:
   provider: pypi
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import setup, find_packages
 
-__version__ = '1.1'
+__version__ = '1.2'
 
 __build__ = ''
 
