added new dot files for version control
Updated .vimrc at work
remove questions from repo
resolved conflicts after merging dotfiles