Update rubocop dependency to >= 0.25
Merge branch 'master' of git://github.com/intridea/omniauth