Cadre flow changes, change order of states, new translations

Hey Simon, can you take a look through this and look for any gotchas I might have missed? I have it running as conversation a8d9f5ea57d94698a181bb5243383838 on Vumi Go, pointing to my fork, and everything seems to be working. I also updated and added some tests and the test suite is passing. Thanks!