Update
Standard keyboard layout.
Merge branch 'master' of https://github.com/muldvang/dotfiles

Conflicts:
	.config/Trolltech.conf