Improve vimrc
Add new aliases
Merge branch 'master' of https://github.com/Mura-Mi/dotfiles