To synchronize with the "wip/gsettings" branch. Mostly just removing unneeded "gconf-bridge.h" includes.