vimrc: Remove MatchTag
vimrc: Don't use cursorline, it slows vim down
Merge branch 'master' of https://github.com/jrunningen/dotfiles

* 'master' of https://github.com/jrunningen/dotfiles:
  Remove ultisnips disabling from .vimrc.before
  vimrc: Remove indent-guides
  vimrc: Remove ultisnips
  vimrc: Remove obsession plugin
  Use jellybeans's vimdiff colors
  Throw out setcolors.vim

Conflicts:
	.gitmodules