Merge branch 'master' of http://github.com/plomlompom/config

diff --combined jessie_postinstall.sh
index e6145e53395a98fed3db4dd722def1563d7fc97f,8d5d5c196cead223913f663d5d95f0738b1f6bd2..e6fd2e551628d609b44416b8fc51988d4b2debaa
--- 1/jessie_postinstall.sh
--- 2/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@@ -59,8 -59,8 +59,8 @@@ f
  
  # Package management config, system upgrade.
  echo 'deb http://ftp.debian.org/debian/ jessie main contrib non-free' \
 -    >/etc/apt/sources.list
 -echo 'deb http://security.debian.org/ jessie/updates main contrib non-free' \ 
 +    > /etc/apt/sources.list
 +echo 'deb http://security.debian.org/ jessie/updates main contrib non-free' \
      >> /etc/apt/sources.list
  echo 'deb http://ftp.debian.org/debian/ jessie-updates main contrib non-free' \
      >> /etc/apt/sources.list
@@@ -199,8 -199,8 +199,8 @@@ elif [ "$1" = "thinkpad" ]; the
          amixer -c 1 sset Master playback 100% unmute
      fi
  
-     # Set up window system and OpenGL.
-     apt-get -y install xserver-xorg xinit xterm i3 i3status dmenu
+     # Set up window system, i3, redshift.
+     apt-get -y install xserver-xorg xinit xterm i3 i3status dmenu redshift
  
      # Set up OpenGL and hardware acceleration.
      apt-get -y install libgl1-mesa-dri