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

diff --combined jessie_postinstall.sh
index 85e464e7bcc6f67336724421547d05ff16804056,6d12cef1815eb6bf1ab4d1055b2abfc2a904d04a..0b628e520d87425aea8106a8e060efea46042dc4
--- 1/jessie_postinstall.sh
--- 2/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@@ -118,6 -118,10 +118,10 @@@ if [ "$1" = "thinkpad" ]; the
  '#START_CHARGE_THRESH_BAT0/' /etc/default/tlp
      sed -i 's/^#STOP_CHARGE_THRESH_BAT0/STOP_CHARGE_THRESH_BAT0=95 '\
  '#STOP_CHARGE_THRESH_BAT0/' /etc/default/tlp
+     sed -i 's/^#START_CHARGE_THRESH_BAT1/START_CHARGE_THRESH_BAT0=10 '\
+ '#START_CHARGE_THRESH_BAT1/' /etc/default/tlp
+     sed -i 's/^#STOP_CHARGE_THRESH_BAT1/STOP_CHARGE_THRESH_BAT0=95 '\
+ '#STOP_CHARGE_THRESH_BAT1/' /etc/default/tlp
      sed -i 's/^#DEVICES_TO_DISABLE_ON_STARTUP/DEVICES_TO_DISABLE_ON_STARTUP='\
  '"bluetooth wifi wwan" #DEVICES_TO_DISABLE_ON_STARTUP/' /etc/default/tlp
      tlp start
@@@ -315,7 -319,7 +319,7 @@@ elif [ "$1" = "thinkpad" ]; the
      apt-get -y install x11-xserver-utils
  
      # Set up pentadactyl. 
 -    apt-get -y install iceweasel
 +    apt-get -y install iceweasel xul-ext-noscript
      apt-get -y -t jessie-backports install xul-ext-pentadactyl
      apt-get -y install vim-gtk
      su plom -c 'mkdir -p /home/plom/downloads/'