switched to pathogen.vim and updated rails.vim, added fugitive.vim
added new vers of csapprox
added some stuff.
merge
merge...