Swapped .cvsignore for corresponding .gitignore files.
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/survey