Summary: Merge Jim's ShellScaffold.sh fixes with Tim's ShellScaffold.sh fixes. Reviewed-by: tbell
Reviewed-by: ohair, dcubed
Reviewed-by: dcubed