more test fiddling
Merge branch 'devel' of github.com:getlantern/lantern into devel