Revert "Enable desktop-save-mode by default"

This reverts commit 2383e5730c945c7c7cd3795d8092cd70977eb30d.

Conflicts:
	core/prelude-ui.el
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Revert "Enable desktop-save-mode by default"