Added a bunch of new options for vim