fix parsing for config files (fixes #69)
Merge branch 'master' into dojo_store