Licensing fixes

Various tweaks to address:

https://bugs.launchpad.net/bugs/1368321
https://bugs.launchpad.net/bugs/1368358
Seems like an odd choice for a bash completion script.