Rubocop: More fixes and cleanups
Updating rubocop
Indentation fixes
Merge pull request #536 from fh/t/rubocop

Rubocop: More fixes and cleanups