Merge pull request #706 from tphoney/rubocopification