More updates to support SalesforceSDKManager switch
Merge pull request #7 from khawkins/unstable

More updates to support SalesforceSDKManager switch