VIMRC: Add/edit mappings, comments and clean-up