Refactored more code with help messages etc.
Refactored more code.

Merge branch 'master' of https://github.com/rkwitt/pypbm