Restored file noting the digidrop-specific branch.  This branch
should continue to track inprogress.
added auth keys for demo app running on digidrop
Merge branch 'inprogress' into digidrop, preserving tool auth keys for digidrop.

Conflicts:
	NMTK_demo/webapp/fixtures/initial_data.json
Changes to apache configuration and NMTK settings to reflect new host arrangement
Changed fixture to include local HCM tools and OTG tools -- OTG key may be wrong
Completed output field selection
Fixed output configuration handling to exactly parallel input
Fixed output format to parallel structure of input
Fixed output format to parallel structure of input
Fixed output format to parallel structure of input
Added images for DataTables
Fixed field names in SF test file so they can 'self-discover'
Fixed up San Francisco sample data file
adjusted sf.vrt
Fixed up SF data geoJSON conversion
Re-added bbox to SF sample data file; not clear why ogr2ogr didn't produce it...
fixed typo in views.py
debugging failure to look up right data file
Trying to enable popup display for point layer
experimenting with thematizing points