Clean up the vimrc. Make sure it's commented

Remove some unnecessary lines, and revert preferred tab bar behaviour