make set_flavour work with permanent=False

`get_flavour` was always checking the `flavour_storage` first, so if `set_flavour` was called with `permanent=False` to set the flavour on the request but not the `flavour_storage`, `get_flavour` was not affected. Change to make `get_flavour` check the request first, and then the `flavour_storage`.