Code style

This fixes problems picked up by the latest RuboCop release.
Merge pull request #42 from bbatsov/code-style

Code style
Minor README changes