Change non-functioning use of QueryValue to EnumValue

Fixes one part of issue #135.
Replace instance of %SystemRoot% with actual value

Closes #135
Use os.path.expandvars instead of regular expressions
Merge branch 'trira-issue_135' into dev