Update vimrc

- General cleanup
- Removed the splice bundle
- Cleaned up indenting and spacing.