Rubocop autofixes
Merge branch 'master' into make-rubocop-happy
Merge pull request #21 from paulnsorensen/make-rubocop-happy

Rubocop autofixes