Added E200_state and facet_state

Added E200_state and facet_state to the new data struct if they exist
Merge branch 'master' into HDDprefix

Pulling in Sebastien's updates to include machine state info in data.
Updated formatting in Sebastien's code.