.
Merge branch 'master' of github.com:andrew-christianson/.emacs.d

Conflicts:
	.gitignore