Add big aggregate change from my third machine
Merge branch 'laptop' into my-rpi

Conflicts:
	config/bashrc
	config/tmux.conf
	sysstat/sysstat2.c