Fixes issues #21 and #25
Fixed settings dialog labels
Merge pull request #36 from jrowny/data-directory-setting

Fixes issues #21 and #25