boom
Merge branch 'master' of github.com:jodonnell/emacs
Merge branch 'master' of github.com:jodonnell/emacs

Conflicts:
	.gitignore
Merge branch 'master' of github.com:jodonnell/emacs