Trying to get some autocomplete stuff working
Merge branch 'master' of github.com:fredericksgary/dotfiles

Conflicts:
	.emacs.d/init.el.symlink