Merge pull request #192 from amalloy/master

Add id/label to the settings dialog
Revert "Merge pull request #192 from amalloy/master"

This reverts commit df0cd875bf5353661b1f8584293647860bf5c0ff, reversing
changes made to f200ebb1d9556f61a90b1d94ed0e5d8fdc949a06.
Merge pull request #194 from aiannacc/revert_pull_request

Revert "Merge pull request #192 from amalloy/master"
Re-fix #191.