Adding tmux size customizations, kaleidoscope as diff tool, and git username.
Merge branch 'master' of https://github.com/skwp/dotfiles

* 'master' of https://github.com/skwp/dotfiles: (21 commits)
  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
  Fix indentation
  Make tmux pane resizing more natural
  Update vimrc
  Add src alias for 'spring rails c'.
  Better colors
  Aliases for rails db migrations
  Remove jasmine.vim which was conflicting with javascript-libraries-syntax.vim
  \sp for specify {} blocks
  Get rid of heavy omni complete - seems to hang on some machines
  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]
  Update docs
  ...

Conflicts:
	tmux/tmux.conf