disable file lock
Merge branch 'master' of github.com:allenlsy/.emacs.d

* 'master' of github.com:allenlsy/.emacs.d: (45 commits)
  add many modes
  Add Cask
  Add fiplr
  config init.el
  Add note about escaping the tyranny of ido-mode in find-file
  Remove pretty-mode, but use Emacs 24's global-prettify-symbols-mode if available
  Require and enable ipretty-mode
  Only use smex in Emacs 24
  Hide lighter for magit-auto-revert-mode
  Return to using switch-window on C-x o
  Require 'ido in init-ido
  Take my own advice and abbreviate file names in ido-choose-from-recentf
  Update README to clarify steps to follow before filing issues
  Check OS before using exec-path-from-shell for $LEDGER_FILE
  Don't rebind C-x C-a in emacs-lisp-mode: it upsets edebug
  Ignore helm-adaptive-history
  Allow inline completions to cycle without eagerly popping up *Completions*
  Also use guide-key for narrowing map via "C-x n" prefix
  Add site-lisp dirs to load-path after creation
  Load magit-git-wip after magit, not directly after vc
  ...

Conflicts:
	init.el
Merge branch 'master' of github.com:allenlsy/.emacs.d

* 'master' of github.com:allenlsy/.emacs.d:
  add sr-speedbar

Conflicts:
	init.el