neocomplete: update settings
Merge pull request #485 from maletor/neocomplete_settings

neocomplete: update settings
zsh aliases to show/hide hidden files in Finder
Unset ctrlp_user_command prior to redefinition
Fix for iTerm themes install on Mavericks

Mavericks cache preferences and overwrites defaults from cache, not
installing it properly. Reading it after install updates the cache with
new values.
Merge pull request #499 from giorni/iterm-plist

Fix for iTerm themes install on Mavericks
Merge pull request #498 from blackxored/ctrlp-unlet

Unset ctrlp_user_command prior to redefinition.
[FIX] fixed an error in vim settings
[fixes #501] Fix ag string typo。
Merge pull request #503 from rkowalewski/master

Fix in vim settings
Merge pull request #502 from keikun17/master

[fixes #501] Fix ag string typo。
Merge pull request #496 from Vijar/master

zsh aliases to show/hide hidden files in Finder
Switch to lokaltog easymotion instead of skwp fork [Fix #447]
Add hpr hub pull-request alias
Don't override ctrl-b for buffer search. we have ,b [Fix #484]
Git recent branches alias
Merge branch 'master' of https://github.com/skwp/dotfiles

* 'master' of https://github.com/skwp/dotfiles:
  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]
  [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
  neocomplete: update settings

Conflicts:
	zsh/aliases.zsh