Tweaks to aliases and vimrc