Merge pull request #85 from reaperhulk/stylin

rubocop style updates
more rubocop fixes