Fixed (and simplified) the bash auto-completion script. Now, *surely*, no further changes to our file layout will break it.