Updates to xcompmgr (if installed), run 'xbindkeys' and/or install xautomation to use shift+scroll in firefox
Merge remote-tracking branch 'origin/master'