xmodmap usage docs -- rename script to be more appropriate
Merge branch 'master' into work