Threading part 2b

I recently completed https://github.com/citra-emu/citra/pull/11, but mistakenly botched master when merging it in. This pull request is to correctly merge bunnei:threading into citra-emu:master.