removed pathogen file
reorganized and cleaned up vimrc
updated plugins
merge