Merge pull request #168 from evoskuil/version2

Update bash-completion script generation to match output.