Fixups for rubocop complaints.

This should fix up the current rubocop complaints.
Merge pull request #255 from scottso/fix_rubocop_issues

Fixups for rubocop complaints.