Will follow up with John when he gets back from break next week about the need for this upload script.  Merging now to get config fixes.