Added 256 color support for putty
Fixed conflict in .vimrc