Fix completion on opts and cmds
Merge pull request #43 from veged/feature/fix-comp

Fix completion on opts and cmds