add EDITOR
merge in changes from local .bashrc