Set EDITOR for general and sudo -e use
Merge upstream
Merge with upstream; resolve small bashrc conflict