Rubocop: Fixing config directory
Merge pull request #2829 from daviddavis/rubocop-config

Rubocop: Fixing config directory
Merge remote-tracking branch 'upstream/master' into rubocop

Conflicts:
	config/routes/api/v1.rb
	config/routes/api/v2.rb