Clean up the vimrc. Make sure it's commented

Remove some unnecessary lines, and revert preferred tab bar behaviour
Merge pull request #2 from markwithers/clean-vimrc

Clean up the vimrc. Make sure it's commented