Unignore neobundle, ignore .cache
New and improved vimrc!
Merge branch 'newvimrc'