Still playing around with KDE...
Merge branch 'master' of github.com:asilata/.dotfiles

Conflicts:
	init.el