Changed vimrc and cleaned obsolete stuff