Reconcile changes between wdtk and whatdotheyknow theme

Deploying WDTK

^{If you've never used diff-theme-override with vim, I've made a screencast of me going through it.}

Ensure local master, wdtk and develop branches are up to date with origin in your local alaveteli checkout
Ensure local master and develop branches are up to date with origin in your local whatdotheyknow-theme checkout
Ensure whatdotheyknow-theme develop is up to date with whatdotheyknow-theme master
Switch your current alaveteli theme to whatdotheyknow-theme (script/switch-theme.rb whatdotheyknow-theme && bundle exec rake assets:clean)
Check out develop in both alaveteli and whatdotheyknow-theme
SSH to vagrant (if thats where your dev version is)
Reconcile views/overrides between alaveteli and whatdotheyknow-theme:

find $(script/current-theme -v) -type f -name "*.erb" -exec \
  script/diff-theme-override -d "vim -d" {} \; 2>/dev/null

Commit changes to whatdotheyknow-theme, push and review.
Review changes between alaveteli wdtk and develop. Consider that you're about to deploy these to production.