Fix order of iso-2022-jp
Set EDITOR environment to vim instead of vi to avoid subversion commit error
Add delete-merged-branches git alias