Move pubnub params to a params class. Update callers. Cleanup.
merge conflict.