Merged wnidows settings into vimrc & added gvimrc