Simpler prompt.
Merge branch 'master' into twitter
Squashed 'vim/.vim/bundle/vim-dispatch/' changes from f2d5fa9..3071ff6

3071ff6 Expand <lnum> in :.Dispatch

git-subtree-dir: vim/.vim/bundle/vim-dispatch
git-subtree-split: 3071ff66ce95b42b3e19458866583d269f780c8f
Merge commit '10ecb563e5d5ef8714436810f6d0d7d19fa711bf'
Squashed 'vim/.vim/bundle/vim-fireplace/' changes from ea1012e..2d1f308

2d1f308 Fix :RunTests with no argument
f25003d Decouple quickfix massaging from lein support
c0a4901 Fix support for Python 3
7b19c1b Require if_pyth on Windows
672d3b5 Use stacktrace nrepl op if available
0936b3c Use correct session to retrieve stacktrace
05206aa Drop obsolete warning
5f1cee1 Never throw exception in fireplace#op_available
c6e0d55 Use nrepl complete op if available
89acd66 Drop qualification of macroexpand-1
feb8ebc Happy path for lookup macros
f5ded81 Drop unnecessary clojure.core
238b526 Use user ns to avoid qualification
9e826fa Allow omitting ns from fireplace#message
79c2a71 Allow checking for nREPL op
c48adc0 Fix jump location for :RunTests error
bc8f3af Cleaner classpath retrieval
2dec3b4 Expose fireplace#register_port_file

git-subtree-dir: vim/.vim/bundle/vim-fireplace
git-subtree-split: 2d1f3088b25ff3d4561bca499c6307792ec41045
Merge commit 'cf366d1345c8fcaf69f7d4ed620840586095800e'
Squashed 'vim/.vim/bundle/vim-fugitive/' changes from e7c7149..4f80883

4f80883 Limit scope of ctrlp.vim :Gstatus hack
bf14c9c Drop support for CtrlP in history

git-subtree-dir: vim/.vim/bundle/vim-fugitive
git-subtree-split: 4f80883e05238c72e3746e616618e55ca1852f77
Merge commit '27817e460d22af78329b0922874cf335d012d1f5'
Merge branch 'master' into twitter