Use $EDITOR instead of config['editor']
Merge branch 'dev'