Commit for same bug as other machine.  Should be ready to fast forward merge now.
Merge branch 'master' of github.com:gunzy83/dotfiles

Conflicts:
	home/.kde/share/config/kglobalshortcutsrc