Cleaned up vimrc, added a few usuful bundles