Switch logic of audio flag to suit the common case
Merge branch 'master' of github.com:craftyjon/firemix
Merge branch 'master' of github.com:craftyjon/firemix
Updates for Firefly