Revert "update json defaults with command line args instead of the other way around."

This reverts commit f068d363df2006dcfbad838cb4712921821b8690.
Merge branch 'master' into stlvectorbranches