Add back all changes from previous PR
Removed files I missed
Got btysnc working, need to fix up rest of plugins.