vimrc updated from work, kde folder added
vimrc conflicts resolved