Change colorscheme and few updates
Merge branch 'master' of github.com:daGrevis/Dotfiles