Get rid of rogue setting overriding theme selection
Add presentation mode
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	.emacs-custom.el