Fix #55: bash completion was broken
Cleanup headers