Update .editorconfig

[ci:skip]
Improve RVM gemset autodetection: make it work even if the user has changed GEM_HOME.
Merge branch 'master' into eternal_sunset

Conflicts:
	CHANGELOG
test