Update rubocop
Merge branch 'master' of https://github.com/tas50/smokeping-chef

Conflicts:
	Gemfile