Fixed bug preventing script from running if using custom output dir.  Fixed bug with expt name not being picked up in old format