management command to add gis stuff, USE_GIS to check whether gis stuff should be used
fix upgrade management command
Merge with develop
Remove GIS from tests
Show Travis status
Merge branch 'feature/degrade_gis' into develop