Fix yasnippet, so it is downloaded from elpa, and correclty initialized
Turned off git-gutter. This version is buggy
Remove extension that isn't wanted
Use git submodules to get a decent set of yasnippets, and ignore the clone from VC
Reload snippets, and add them
Disabled auto-complete-auctex. Doesn't seem to be doing much
Merge branch 'master' of github.com:oc243/.emacs.d

Conflicts:
	oc243/prelude.el