Reorganizing vimrc

+ Adding comments
+ Fixing a macro or two