Instructions on variables and HTML.
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
Reduce the memory used to serve /body/all-authorities.csv

On WDTK, /body/all-authorities was using lots of memory - this
commit reduces that by (a) fetching the public bodies in batches,
rather than keeping them all in memory at one time and
(b) writing the CSV to a file and then returning it with
X-Sendfile (or equivalent), rather than returning the whole file
from memory with send_data.

There's a FIXME to do with the layout of download directories; if
that's changed, the example nginx config, etc. will need to be
updated too.

This commit also adds a basic test for reasonable CSV being
returned and switches from FasterCSV to CSV in order to fix this
NotImplementedError under Ruby 1.9:

   Please switch to Ruby 1.9's standard CSV library.
   It's FasterCSV plus support for Ruby 1.9's m17n encoding engine.

(The CSV version seems to still work fine under 1.8.7.)
Merge branch 'master' into rails-3-develop
Session keys are stored as strings in Rails 3.

Update our session-stripping code.
Insert cookie stripping at correct point in middleware stack.
Update globalize3 repo.

This is the commit where @henares' pull request was merged. This is a quick fix, but I think we want to see if we can use the globalize 3.0.1 gem with minimal fixes. It causes tests to fail at the moment, I think because we still have translated attributes in our public_bodies table (and not null constraints at the databse level on at least the name attribute).
Use our own copy of globalize3 for now.
Add a helper method for temporarily setting I18n.default_locale

Although the I18n library has an I18n.with_locale helper, there's
no equivalent for I18n.default_locale.  This method will make a
couple of our tests clearer and less brittle.
Refactor some tests to use with_default_locale
Fix construction of example public bodies for upstream globalize

We're trying to switch to an upstream version of globalize, which now
has Henare's change to allowed blank values without them being
converted to nil - however, there is another intermediate change that
was introduced which means that the name is only written back to the
original table if the locale matches the default locale.  This is
described in more depth here:

   https://github.com/globalize/globalize/pull/183

This change broke the make_single_language_example helper, but this
commit fixes that by also setting the default locale before creating
the example public bodies.
Update commonlib to include Alaveteli support in install-site.sh
Merge branch 'fixes-for-upstream-globalize' into rails-3-develop
Allow the rails_env to be set from the deploy.yml file.
Merge branch 'all-authorities-reduce-memory' into rails-3-develop

This has already been cherry-picked into the wdtk branch, but
it should also be merged into rails-3-develop
Also update Gemfile.lock to refer to the upstream globalize
Add rails env to example config.
Merge branch 'feature/set-rails-env-from-cap-config' into rails-3-develop
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
Move getting similar requests to the InfoRequest model.