Merge remote-tracking branch 'hmslincs/dev' into dev
- catch local merge of (dave-sean-dev to dev) up with hmslincs/dev
make deploy always run collectstatics

The previous version ran collectstatics only when images were remade, but
collectstatics is necessary also when other non-image files are updated.
(Hence I renamed the internal boolean flag STATICS to IMAGES.)
Merge remote-tracking branch 'hmslincs/dev' into dave-sean-dev