bottle-run has completion for the bottle
Code repetition removed
Bash completion is refactored a bit