Attempting to get it to ignore the timeline div after it slides out
Merge branch 'master' of github.com:sdc50/geotimeline
Merge branch 'master' of github.com:sdc50/geotimeline

Conflicts:
	GeoTimeline/geotimeline/static/js/timemap.js
first attempt at trying to get a zoom
Merge branch 'master' of github.com:sdc50/geotimeline

Conflicts:
	GeoTimeline/geotimeline/static/js/timemap.js
Merge branch 'master' of github.com:sdc50/geotimeline
zooming attempt
Merge branch 'master' of github.com:sdc50/geotimeline