Copy updates from vimrc windows
Cleanup
Cleanup
Added environment checks