Commit bab0b9f2d21d993c3f25ee00ce2d243a4dc0de93

Edward Thomson 2013-11-22T18:02:12

clean up state metadata more consistently