Get overlay-scrollbar working. Minor updates and fixes to gnome-settings-daemon and unity-extra/unsettings
Merge remote-tracking branch 'shiznix/master'