merge
Merge branch 'master' of github.com:dhaley/dot-emacs

Conflicts:
	.gitmodules