Orig desktop files.
Merge branch 'master' of github.com:dnephin/dotfiles into desktop

Conflicts:
	.kde/share/apps/konsole/Shell.profile
	.kde/share/config/kglobalshortcutsrc
	.purple/prefs.xml
	.xsession