Add the xapiandbs to the list of directories to be copied across.
Change order of steps

update_code task fails if the config files aren't there yet
Merge branch 'deploy-fixes' into gh-pages
Merge branch 'gh-pages' of ssh://git.mysociety.org/data/git/public/alaveteli into gh-pages