Adjustments for Rubocop
Added Rubocop to `rake ci`
Rubocop adjustments Fixup