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: correct settings file used by members interests import script
ZA: members interests 2014 data
ZA: Update members interests convert script to handle 2014 format names

The 2014 members interest data does not include MPs' middle names. This
searches for names that contain the first and last name if the existing
approach fails.
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: Converted 2014 members interests data

Includes necessary manual slug corrections in the convert script for the
2014 data.
ZA: single format for members' interest release names and correct dates

Members' interests releases are currently named inconsistently and in a
sometimes confusing manner. This updates the convert script so that
each year follows a single format and corrects release dates for years
where the correct release date is known.
ZA: re-convert members' interests data for import

With changes to the database, members' interests data from 2010-2013
needs to be re-converted using convert_to_import_json.py in order to
allow successful import of the data, while 2014 must be re-converted
so that the new release name format is applied. Includes corrections
for previously unmatched declarations.
ZA: corrections to 2011 members' interests data
Add members interests delete existing command
ZA: update documentation to reflect addition of 2014 members' interests