Replace tabs with spaces

Also remove whitespace and end of lines
Merge branch '30-annotation-filter'
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/theyworkforyou
Photo update from admin web photo upload interface.