Another minor cleanup, mostly DRY improvements
Merge branch 'master' of github.com:getlantern/lantern