Merge branch 'master' into interface
load default dataset
different id format with hyphens
cookie expires in 30 min from last visit
Merge remote-tracking branch 'origin/interface' into nchaney
Merge remote-tracking branch 'origin/jon' into nchaney