better handling of null controller from config file
Merge branch 'master' of github.com:getlantern/lantern