* A lot of cleanup and test adding for handling primary users.
* Trying to genericize a lot of the message names and leave the state machine decide on state.
* Simplifying the ActionsMock in state_machine_unit_test.
* Loads of file renames to make easier to read.