properly encapsulating name/id
fix remnant of old variable
Merge branch 'wacom-changes'

Conflicts:
	usr/share/xtouchy/xtouchy-toolbox.py