Merge branch 'gaia'

Conflicts:
	autostart

diff --cc autostart
index 4a53a95,ade10b6..38e5e2a
--- 1/autostart
--- 2/autostart
+++ b/autostart
@@@ -1,6 -1,7 +1,6 @@@
+ nitrogen --restore &
  /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 &
- 
  /usr/lib/notify-osd/notify-osd &
 -bluetooth-applet &
  gnome-power-manager &
  xscreensaver &
  volumeicon &
@@@ -15,12 -15,8 +14,13 @@@ sparkleshare restart 
  [ $(pgrep -c offlineimap) = 1 ] || tmux new-session -d -s offlineimap offlineimap &
  
  if egrep -iq 'touchpad|click-pad' /proc/bus/input/devices; then
 +    synclient MinSpeed=0 &
 +    synclient MaxSpeed=2.5 &
 +    synclient PalmDetect=1 &
 +    synclient AccelFactor=0.15 &
      synclient VertEdgeScroll=1 &
 +    synclient VertScrollDelta=15 &
+     synclient VertTwoFingerScroll=1 &
      synclient TapButton1=1 &
      syndaemon -i0.2 -d &
  fi