Merging changes from agonzales-usgs

New changes fix build errors, new jar file now launches both in Eclipse and the command line