Settings: Generic Blacklist fix derps and move things where they shoul be

Change-Id: I31fb1a9212600d03a67a95a9af364dc31922fbe0
Signed-off-by: Dan Trifan <jimsth@gmail.com>