Don't use the 2 space indentation rule.

Alaveteli uses 4 spaces.
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop