Update za-hansard / popit-resolver to include some name resolution fixes
Don't show HTML in Hansard appearance excerpts

Thanks to Chris Mytton and Matthew Somerville for comments and
suggestions for this.
curl should get install-site.sh from githubusercontent.com, and should follow redirects
Merge remote-tracking branch 'origin/vagrantfile-curl-fix'
Vagrantfile: the dev-argument branch is now in master

It's better to just point to master now that it includes those changes
anyway.
Vagrantfile: the gems are installed by bin/prepare_environment.bash

... so don't list the required gems redundantly in install-as-user as
well.
Vagrantfile: the virtualenv location depends on $DIRECTORY
ZA: redirect person/../appearances/ to person/../

The person/../appearances/ url current displays 'No appearances were
found'. The correct fix is to redirect to the appearances tab on the
relevant person page, but this relies on issue #930 (ZA: person page
tab selection should change url). As a temporary fix this redirects the
user to the person page and avoids the error.
Vagrantfile: make sure a native JSON gem is installed

Otherwise you get this warning (which seems to cause a failing return code)
from collectstatic:

  pipeline.exceptions.CompilerError: [WARNING] MultiJson is using the
  default adapter (ok_json).We recommend loading a different JSON library
  to improve performance.
Vagrantfile: yui-compressor must be installed for django-pipeline
Update the Vagrantfile such that you can switch between countries

Previously, the Vagrantfile would only set up Pombola for Kenya.  These
changes mean that it creates databases for all countries and config files
such that you can switch between them with the bin/switch-country.py
script.
Vagrantfile: add notes about the Vagrantfile's usage
Merge branch 'appearances-fix'
ZA: Merge "That Week in Parliament" and "Impressions" on the homepage

PMG have requested that instead of having "Impression" and "That Week in
Parliament" as separate sections on the front page, we merge these two
into a single list across the two columns called "That Week in
Parliament".

Fixes #1516