Change default keyboard layout
Merge branch 'master' of github.com:d0/dotfiles

Conflicts:
	.xinitrc