Misc.
Merge branch 'master' of https://github.com/dnephin/dotfiles

Conflicts:
	.kde/share/config/kglobalshortcutsrc
Add xsession to disable touchpad while typing.