getlantern/lantern#1762 Suggested improvements to original fix

@myleshorton Suggestions from my review of your changes
I reordered these because the yaml library orders fields in the YAML to match the struct, and I wanted MasqueradeSets to come last.