Refactor .vimrc. Add couple more settings