default rubocop config
words, use them.
Merge remote-tracking branch 'upstream/master'
Do some more refactoring to make hound happier