update for 2013
Merge branch 'master' of git.eff.org:public/cyberspying.eff.org
merged something old to push back to eff branch