Ignore .bookmarks.el and eshell-generated files.
Enable company mode globally
local conf
Octave mode
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into local
org-mode capture templates
Merge branch 'local' of http://gitlab.lug.ustc.edu.cn/wzhd/emacs-d into local
Merge branch 'master' into local
Better handle maximize-frame when frames are full-screen
org-mac-link-grabber has been renamed to org-mac-link (fixes #131)
Merge remote-tracking branch 'upstream/master' into local
Add cl-lib-highlight
Drop clojure slime support, and make slime work with common lisp

See #56, #57, #70

If upgrading, first remove ~/.emacs.d/elpa/slime-fuzzy* and
~/.emacs.d/elpa/slime-repl*, then restart Emacs.
Merge branch 'master' of https://github.com/wzhd/emacs.d
Merge remote-tracking branch 'upstream/master'
Merge branch 'local'