Config file for auto-complete, and associated init changes.
Merge branch 'master' of github.com:jcriner/emacs

Conflicts:
	itch.org