Restore i3status config for laptop
Update ST3 packages
Update ST3 packages (again)
Start unity-settings-daemon when logging into i3
Merge branch 'master' into laptop

Conflicts:
	.i3/config.symlink
Merge remote-tracking branch 'origin/laptop'

Conflicts:
	.i3/config.symlink