Allow user to not use solarized
Add aliases ('cls' and 'brewU')
Merge pull request #531 from ianks/master

Add aliases ('cls' and 'brewU')
Ignoring just "tags" is too generic

My application had a folder named "tags" as part of its business rules and because of this it got ignored.
I believe upadting this section according to the very link in the comment above should fix it. (not ignoring `tags/` folder).
Start tmux window in /Users/ianks/.yadr
Merge https://github.com/skwp/dotfiles

* https://github.com/skwp/dotfiles:
  Add aliases ('cls' and 'brewU')
  Make tmux pane resizing more natural
Update zprezto
Merge pull request #535 from ianks/master

New windows from current pane path, easy reloading of Tmux
Merge pull request #536 from ianks/update-prezto

Update zprezto
Merge pull request #533 from lfilho/patch-1

Ignoring just "tags" is too generic
Merge pull request #532 from ianks/solarized-choice

Allow user to not use solarized
Increase number of recent branches
gpsh now automatically sets up tracking for the current branch name
色々修正
競合を解決
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  gpsh now automatically sets up tracking for the current branch name
  Increase number of recent branches
  Update zprezto
  Start tmux window in /Users/ianks/.yadr
  Ignoring just "tags" is too generic
  Add aliases ('cls' and 'brewU')
  Allow user to not use solarized

Conflicts:
	zsh/aliases.zsh