Merge branch 'simplecov'
ignoring Gemfile.lock