Update some things...
Forgot these...
Merge branch 'cm-10.2-halo2' of github.com:torrented/android_packages_apps_Settings into cm-10.2-halo2