Don't use powerline fonts in airline [Fix #367] maybe
Remove redundant recommended OSX tool 'autojump' 

autojump 'j' functionality is matched/replaced by fasd 'z' command (installed and enabled as a prezto submodule by default). Instead of typing `j [dirspec]`, you simply type `z [dirspec]`.
Merge pull request #377 from phillipalexander/patch-1

Remove redundant recommended OSX tool 'autojump'  from README.md
fix can't find pane bug
Merge pull request #379 from kris-luminar/bugfix_cant_find_pane

fix can't find pane bug
Update ctrlp.vim
Removed bundle kogakure/vim-sparkup.git since the repo doesn't exist on github anymore
Merge pull request #390 from jby/fix_vim-sparkup

Removed bundle kogakure/vim-sparkup.git
Merge pull request #387 from maletor/patch-2

Update ctrlp.vim
Merge remote-tracking branch 'skwp/master'

* skwp/master:
  Removed bundle kogakure/vim-sparkup.git since the repo doesn't exist on github anymore
  Update ctrlp.vim
  fix can't find pane bug
  Remove redundant recommended OSX tool 'autojump'
  Don't use powerline fonts in airline [Fix #367] maybe

Conflicts:
	tmux/tmux.conf
fix update bugs