Added setting to set preferred stream type. Defaults to iOS streams.
General cleanup and preparations for 4.0.0