Split master_switch_state into two booleans.

See #45 for details.

Will hold of merging this until front-end has been updated to deal with changed fields.