Refactoring how column names appear in spreadsheet.
Merge from master.
Removed unwanted columns from daily and discrete site data.
Applied correct column headers to discrete data spreadsheet.
Killed confusing unimplemented, uncalled method.
Cleaning up in response to Dave U's feedback.
Ugly merge from upstream master.
Merge branch 'NSM-209'

Conflicts:
	src/main/java/gov/cida/sedmap/data/CharSepFormatter.java
	src/main/java/gov/cida/sedmap/data/Fetcher.java
	src/main/java/gov/cida/sedmap/data/Formatter.java
	src/main/java/gov/cida/sedmap/data/GeoToolsFetcher.java
	src/main/java/gov/cida/sedmap/data/HeaderType.java
	src/main/java/gov/cida/sedmap/data/JdbcFetcher.java
	src/test/java/gov/cida/sedmap/data/GeoToolsFetcherTest.java
	src/test/java/gov/cida/sedmap/data/JdbcFetcherTest.java