rubocop should ignore the vendor directory
Merge branch 'enhancements'