remove redundant 'states' folder
Merge branch 'upstream/master' into 'idaho'
removes redundant 'states' folder
'states/id/config.yml' => 'id/config.yml'