Add rubyocop.el
Remove conflict