switching to programmer dvorak
Merge branch 'master' into laptop

Conflicts:
	scripts/xmonad.start