Remove mate_wait script and set `mate -w` as EDITOR in bash config.