Merge branch 'master' of github.com:purcell/emacs.d
Merge branch 'master' of github.com:purcell/emacs.d
Enable savehist-mode by default (though M-x already had a history)
Only call fullframe after commands have been loaded
Use guidekey for the "C-c ' f" rinari prefix too
Use pp-eval-expression for M-:
Merge branch 'master' of github.com:purcell/emacs.d

Conflicts:
	lisp/init-lisp.el
Merge branch 'master' of github.com:JamesYuan/emacs.d