xmodmap update
Merge branch 'master' of https://github.com/telser/dotfiles

Conflicts:
	.Xmodmap