Updated and add modules for vim, updated vimrc