Bknowles fix rubocop citations

Okay, so this should actually fix the first round of rubocop citations, and leave me in my own branch instead of having me be stupid and trying to work from master.  Sigh....