Fix merge conflict
create editor file
Remove hidden files from ll
Change vi mode to emacs
Fix docs
Added Ctrl-R, reverse history search for :commands
Removed mapping; doesn't exactly work. You can still use Ctrl-R when in :ex mode
Sneak: hit Space and type two letters to quickly jump somewhere
Fix merge conflict
Add ATI power management aliases and coloured directory listings
Use diff3 for merge conflicts
Merge branch 'personal' of github.com:taheris/dotfiles into personal

* 'personal' of github.com:taheris/dotfiles:
  Add ATI power management aliases and coloured directory listings
  Fix merge conflict
  Sneak: hit Space and type two letters to quickly jump somewhere
  Removed mapping; doesn't exactly work. You can still use Ctrl-R when in :ex mode
  Added Ctrl-R, reverse history search for :commands
  Fix docs
Add home bin to path
Un-vimify inputrc
Merge branch 'master' into personal

* master: (30 commits)
  Remove tagbar settings [Fix #464]
  Fix Ag functions
  Remove duplicated plugin
  Decided disabling arrow keys was hurting new people too much
  Update vim-improvements.vundle
  Snipmate's version notice removed
  Snipmate description updated
  change string comparison
  Add fugitive to lightline statusbar
  Improve easymotion highlighting to be yellow not an ugly red block
  Always install zshrc; prevents problems if prezto dir exists but zshrc is missing [Fix #452]
  Update README.md
  Update README.md
  Fixed wrong setup for easyvim
  Don't mess with bundler if it's not available
  Removed tagbar; not using
  Remove mvim binary; ships with homebrew's macvim [Fix #450]
  Add Bitdeli badge
  Split vundles into multiple files to reduce churn
  More readme cleanup
  ...

Conflicts:
	vim/vundles.vim
checkout master vundles.vim
Merge branch 'personal' of https://github.com/taheris/dotfiles into personal

* 'personal' of https://github.com/taheris/dotfiles:
  Add dockerip script
  Un-vimify inputrc
  Add home bin to path
  Use diff3 for merge conflicts
  Add ATI power management aliases and coloured directory listings
  Fix merge conflict
  Change vi mode to emacs
  Remove hidden files from ll
  create editor file
  Fix merge conflict
Fix color flag on ls
Merge branch 'personal' of https://github.com/taheris/dotfiles into personal

* 'personal' of https://github.com/taheris/dotfiles: (21 commits)
  rm duplicate editor and visual env variables
  remove broken terminal cursor shape
  change email
  Add the agnoster prompt, with customizations
  Explain how to deal with unsolarized terminals in docs
  If you don't use a solarized terminal, you have to set g:yadr_using_unsolarized_terminal now [Ref #487]
  Add emacsclient aliases
  Update docs
  Ability to disable solarized enhancements [Fix #487]
  0_path.zsh reinserts .yadr paths twice in tmux
  Git recent branches alias
  Don't override ctrl-b for buffer search. we have ,b [Fix #484]
  Add hpr hub pull-request alias
  Switch to lokaltog easymotion instead of skwp fork [Fix #447]
  fix dark mode in vim+iterm2
  [fixes #501] Fix ag string typo。
  [FIX] fixed an error in vim settings
  Fix for iTerm themes install on Mavericks
  Unset ctrlp_user_command prior to redefinition
  zsh aliases to show/hide hidden files in Finder
  ...
remove depth from du