Corrected errors/warnings reported by rubocop
Added ripper-tags
Fixed merge conflicts