Go back to linear space for contour lines
Add some docstrings to the app server.
Remove useless print statement from diff test
Merge pull request #36 from enthought/refactor/mutliple-data-sources

Prepare MapView for multiple data sources
Merge remote-tracking branch 'origin/master' into enh/visualize-salt-field

Conflicts:
	app.py