Added and updated vim commands with macros