Revert Material Dark

Cleaning up

Cleaned up a little trash after reverting Material Dark. Fixed my brain farts.
Merge branch 'lollipop' of github.com:TheGeekyNimrod/android_packages_apps_Settings into lollipop