fixed version update
Merge branch 'devel' of github.com:getlantern/lantern into devel
beta version token fix
Fixed error handling in geo ip lookup closes #2011
Merge pull request #2013 from getlantern/2011

Fixed error handling in geo ip lookup closes #2011
More logs #2009
#2020 extractExecutableFromJar now makes the target directory if necessary
Updated test tokens and README
.travis.yml fixes
Removed unused MasqueradeListener
Added badges
Added code coverage
Travis fixes
More travis fixes
Removed appledaily.com.tw from LanternProxyingTest
Removed godoc badge
Code coverage fixes for travis.yml
Tried to combine jacoco with regular testing
Trying to do coverage with cobratura
Trying to do coverage with cobertura