Merge branch 'master' into odmtools

Add recent changes from master to our current branch

Author: stephanie

.travis.yml

@@ -47,12 +47,12 @@ before_install:
 # python -m pip makes the install go into the virtualenv
   - sudo pip install --upgrade pip
   - sudo python -m pip install pandas
-  - export PYMSSQL_BUILD_WITH_BUNDLED_FREETDS=1;python -m  pip install pymssql
+  - export PYMSSQL_BUILD_WITH_BUNDLED_FREETDS=1;sudo python -m  pip install pymssql
 #  - python -m  pip install mysql-python
 install: # now just our code
-  - pip install -e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4
-  - pip install   .
-  - pip install  -r requirements_tests.txt  --allow-external pyodbc --allow-unverified pyodbc
+  - sudo pip  install -e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4
+  - python -m pip install   .
+  - python -m pip install  -r requirements_tests.txt  --allow-external pyodbc --allow-unverified pyodbc
     # pysqlite
 #  - pip install pysqlite
   - pip list