ignore any grep aliases that might be defined
Don't clobber HISTSIZE or SAVEHIST if they're already set
Existing code indents with spaces, not tabs, conform.
Fixed command autocomplete for Symfony 2.6.x
add current bookmark to rkj-repos theme
Fix dircycle plugin

dircycle right did not behave as expected and was fixed
Add itunes shuffle command to OSX plugin.

Added shuffle functionality to the itunes command in the OSX plugin.
iTunes 12 doesn't support setting the "shuffle" property on the playlist
from what I've read, so this simulates the user interacting with the
iTunes interface. The toggle option "clicks" the shuffle button in the
Now Playing area. This has the effect of toggling the shuffle setting on
whatever is currently playing. The on and off options use the Shuffle
menu bar items.

Usage: itunes shuffle [on|off|toggle]
Extract VCS folders definition to avoid repetition
Ignore .bzr folders in grep too
Use unaliased grep in flag check
Tidy up the grep.zsh library
Change to alias and remove deprecated GREP_COLOR
Merge pull request #3366 from ratza/master

Fix for command autocomplete for Symfony 2.6.x
Merge pull request #3403 from mcornella/fix-grep-library

Fix grep.zsh library
Merge pull request #3326 from DanielFGray/master

ignore any grep aliases that might be defined
Merge pull request #3359 from unixorn/dont-clobber-histsize-and-savehist

Don't clobber $HISTSIZE and $SAVEHIST
Merge pull request #3389 from bubenkoff/add-current-bookmark-rkj-repoz

add current bookmark to rkj-repos theme
Merge pull request #3395 from vmalloc/patch-1

Fix dircycle plugin
Merge pull request #3399 from ryan-robeson/add-itunes-shuffle-command-to-osx-plugin

Add itunes shuffle command to OSX plugin.
Mod: add newline before the prompt_char