Fix sync, and change most repos back to AOKP
Merge pull request #1 from timpohladthomas/patch-1

Fix sync, and change most repos back to AOKP