Clean up rename util

Now uses the EDITOR environment variable so renamed the script.
Merge branch 'master' into grapefruit