"merged" files from laptop
updated .gitconfig
added vim bookmarks
unified .gitconfig
"Merging" from laptop branch
Merge branch 'master' into laptop