Added git-flow completion, removed depricated GREP_OPTIONS