Don't use cl-lib in init-locales (see #117)
Remove dangling reference to desktop-save-mode
Don't use frame-restore in Emacs HEAD
Revert "Remove dangling reference to desktop-save-mode"

This reverts commit 72843466db51db0d49429663563bb99f39700b0d.
Merge branch 'master' of github.com:purcell/emacs.d
Merge branch 'master' of github.com:JamesYuan/emacs.d
c