Merge pull request #37 from skudriashev/command-line-options

Clean-up command-line options
Merge pull request #34 from skudriashev/tox-pep8-env

Added pep8 tox environment
Use string format function in all cases