More dvorak updates
Merge branch 'dvorak'

Conflicts:
	rc-files/bashrc