Not complete but some useful changes to bitrate code so merged anyway. ABR disabled for now since it needs tuning and a better way of knowing when the bitrate change has actually taken effect.