Fixed some shortcuts that didnt' work in terminal vim and cleaned up vimrc