Simplify .vimrc
Fixed for dark background
Fixed conflicts