Merge branch 'dev'

scottgigante · scottgigante · commit 30b747df5788 · 2018-12-21T22:05:42.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,10 @@ sudo: required
 
 cache: pip
 
+before_install:
+  - python -m pip install --upgrade pip
+  - pip install --upgrade setuptools
+
 install:
   - cd Python; python setup.py install
 
