Revert "Makefile: update-demo-from-bungledeps"

This reverts commit 2f334e47e9db1a8d024a1f080a2c1a018b96e00e.
Add changelog entries for changes pulled in via #327.
Delete obdolete select-option demo.