started refactoring, broken commit for fix by bgraf
clean-up, working again
fixed README
fixed BASH completion
fixed BASH completion
smaller changes, TODO updated
Merge pull request #1 from josefbehr/master

Some refactoring