Merge pull request #48 from kjetilho/feature/update-rubocop
update rubocop configuration with new cop names, fix complaints