Merge branch 'master' into develop
Add maintainer instructions to README for now.

 * TODO We need a separate place (and preferably git repo for maintainer
   docs, scripts, etc.). I've started putting these things in maint/ in
   the top-level of bridgedb.git, but since I think that service
   maintainance should be kept separate from the software maintainance,
   I haven't committed them yet. That said, here are the instructions
   for bumping versions, for lack of a better place to put them.
Select language and language direction based on order in header

We guess which language gettext will choose by iterating over
the languages in the Language header and selecting the first
one we support. We assume a user will prioritize languages in
their browser. We then render the page using the selected
language, or English if it is no available. Bug fix on #9157.

(cherry picked from commit a31c592eadd72a659f22497f66e77fb90c6c207b)
Signed-off-by: Isis Lovecruft <isis@torproject.org>

    Taken from branch 'sysrqb/bug9157_r2_rebased'.
Add more documentation about how to use the automatic versioning.
Add 'tests' and dependencies to extras_require in setup.py.
Add zip_safe=False flag to setup.py for access to data files and templates.
Bump the Twisted version.
Remove deprecated distribute dependency.
Bump the pygeoip version.
Fix the crunchbang in scripts/bridgedb to respect the environment.

 * This should also help save the whales.
Add a unittest runner to scripts/bridgedb.

 * ADD commands 'test' and 'coverage' to scripts/bridgedb. To run
   twisted.trial based unittests, after BridgeDB has been installed, do:
       $ bridgedb test
   and to run the same tests under python-coverage, do:
       $ bridgedb coverage

 * ADD dependencies for unittests and coverage:
     - coverage
     - trialcoverage
     - sure

 * FIXES #9872
Cleanup explanations of options in bridgedb.conf.
Initial commit
Rewrite/refactor descriptor generator code

It should be better this way.
Merge branch 'feature/9937-desc-gen-r1' into develop.

The 'feature/9937-desc-gen-r1' branch is actually the entirety of a separate
repo, https://github.com/sysrqb/tdgen from the master branch. It was merged by
doing:

  $ git clone https://github.com/sysrqb/tdgen && cd tdgen
  $ cd ../bridgedb
  $ git checkout -b feature/9937-desc-gen develop
  $ git remote add tdgen ../tdgen
  $ git fetch tdgen
  $ git merge -S --no-ff tdgen/master
Add a .DEFAULT to the Makefile.
Add 'reinstall' directive to the Makefile.
Update the dependencies in the README.

Thanks to mrphs for pointing out on IRC that python-dev was missing.
Move generatedescriptors.py → scripts/gen_bridge_descriptors.

 * ADD scripts/gen_bridge_descriptors to setup.py so that the crunchbang is
   appropriately rewritten upon installation.
Update setup.py to exclude .po files from installs; update crunchbang.

 * ADD exclude_package_data directive to setuptools.setup() call, to exclude
   all .po files from being installed.
 * FIX the crunchbang in setup.py to respect the environment and save the
   whales and all that.
 * UPDATE the copyright/authors/license header. I hear it's not 2007 anymore.