Merge pull request #1254 from jmaas/master

Bash completions were broken; deleted.
Makefile: update eraseconfig target to reflect changes wrt collections.