A few vimrc changes, and removing some git alias made redundant