Re order enums because I can’t insert one. Stupid.
Merge pull request #606 from jtwigg/develop

Re order enums because I can’t insert one. Stupid.