Really add EDITOR changes. Also track master for submodules.