Fix remaining issues in async/sync mode switching.#270

bsneed merged 10 commits intomainsegmentio/analytics-swift:mainfrom

bsneed/asyncAndWaitsegmentio/analytics-swift:bsneed/asyncAndWaitCopy head branch name to clipboard