Improved aliases and vimrc