Don't start redshift.
Trim down .tmux.conf more.

Conflicts:

	.tmux.conf
uhh
Merge branch 'master' into gandalf
Remove set -o vi.
Merge branch 'master' into gandalf
Merge branch 'master' into gandalf
Merge branch 'master' into gandalf

Conflicts:
	.xsession
Swap out sshfs for cifs-utils.
Merge branch 'master' of github.com:mjkelly/config into gandalf
Fix up trackpad.
Background image.
Disable right-bottom right-click area.
Fix up multi-finger right click and actually disable area-based right-click.
Merge branch 'raven'