Made bash_completion more robust (either version).
Makefile tweaks.