updated to rubocop 0.24 and fixed rubocop errors
enable at the beginning
merging
still merging