Add a few more things to .ffignore.
Merge remote-tracking branch 'origin/staging' into staging