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.
Require git-rebase-mode
Disable bug-reference-github pending upstream changes

https://github.com/arnested/bug-reference-github/issues/1

Fixes https://github.com/purcell/emacs.d/issues/122
Merge branch 'master' of git://github.com/purcell/emacs.d