Change default editor to gvim.

Seems to work properly as compared to most of the other options I've tried.