Merge pull request #29 from rangerofthewest/master

Updating rangerofthewest
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
Merge pull request #31 from rangerofthewest/rangerofthewest

Rangerofthewest
Merge pull request #32 from rangerofthewest/bad-news

Merge pull request #30 from rangerofthewest/master
Merge pull request #34 from rangerofthewest/master

Updating bad-news