Vim: Some cleanup, use <Leader> now instead of ','