Changed vim colorscheme and various cleanup