Death march

``make_bash_completion`` works again, though cannot import ``make_cli`` or ``make_command`` yet as they haven't been updated. This approach is _much_ cleaner