renamed "native" to "global" (makes more sense, yo)
removed other setting-related things
removed "peers" folder
Merge remote-tracking branch 'upstream/master'
resolve merge