Revert to Sublime as merge tool (someday I'll settle down)
Fix up Go locations