vim changes
Merge branch 'master' of https://github.com/yramagicman/dotfiles

* 'master' of https://github.com/yramagicman/dotfiles:
  new os commit
  blah blah blah
  change colorscheme

Conflicts:
	.vim/config/defaults.vim