updated vimrc
added vim-foreplay, vim-clojure-static
fixed conflicts