`docopt` incorrect usage + pep8

Hi,

It seems the migration to `docopt` isn’t complete, so I made it better by changing `elif`s to `if`s in handling the command line options.
In addition, some changes in order to more completely conform to pep8 were made.

Thanks,
Júda
That's issue #6 . My bad on a copy/paste error I guess.