Merge branch 'geopandas-explorer' of https://github.com/synthicity/urbansim into geopandas-explorer

Conflicts:
	.travis.yml

Author: fscottfoti

setup.py

@@ -32,6 +32,7 @@
     packages=find_packages(exclude=['*.tests']),
     install_requires=[
         'bottle>=0.12.5',
+        'geopandas>=0.1.0',
         'matplotlib>=1.3.1',
         'numpy>=1.8.0',
         'pandas>=0.13.1',