getlantern/lantern#1762 Suggested improvements to original fix

@myleshorton Suggestions from my review of your changes
Here is where we handle either using the forced enproxy config or a dynamically built one.