Fix rubocop configuration to match devtools
Remove work-around that is no longer needed with the rspec expect syntax
Merge branch 'master' into devtools

Conflicts:
	Rakefile