rubocop cleanup (still a few long methods)
Merge pull request #44 from flapjack/41_rubocopped

rubocop cleanup (still a few long methods)