Long overdue vimrc update
More overdue changes