Updating Config and stuff
Merge branch 'rangerofthewest' of https://github.com/rangerofthewest/pangeo-code-java into rangerofthewest

Conflicts:
	.metadata/.plugins/org.eclipse.jdt.core/1604550335.index