Fixed race conditions
Merge branch 'master' of https://github.com/getlantern/yamlconf