Re-activated .vimrc and .gvimrc files. Commented out most of .vimrc for now, and also disabled most stuff in vim/.