Conflict merge 1

plugins/chucknorris/fortunes/chucknorris

@@ -17,11 +17,17 @@ Chuck Norris' blood type is AK+. Ass-Kicking Positive. It is compatible only wit
 Chuck Norris is 1/8th Cherokee. This has nothing to do with ancestry, the man ate a fucking Indian. 
 %
 In fine print on the last page of the Guinness Book of World Records it notes that all world records are held by Chuck Norris, and those listed in the book are simply the closest anyone else has ever gotten. 
+<<<<<<< HEAD
 %
 There is no chin behind Chuck Norris' beard. There is only another fist.
 %
 Chuck Norris does not teabag the ladies. He potato-sacks them. 
 %
+=======
+There is no chin behind Chuck Norris' beard. There is only another fist.
+%
+Chuck Norris does not teabag the ladies. He potato-sacks them. 
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 Pluto is actually an orbiting group of British soldiers from the American Revolution who entered space after the Chuck gave them a roundhouse kick to the face. 
 %
 When Chuck Norris goes to donate blood, he declines the syringe, and instead requests a hand gun and a bucket. 
@@ -129,7 +135,10 @@ Chuck Norris can drink an entire gallon of milk in thirty-seven seconds.
 Little known medical fact: Chuck Norris invented the Caesarean section when he roundhouse-kicked his way out of his monther's womb. 
 %
 Chuck Norris doesn't bowl strikes, he just knocks down one pin and the other nine faint. 
+<<<<<<< HEAD
 %
+=======
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 The show Survivor had the original premise of putting people on an island with Chuck Norris. There were no survivors, and nobody is brave enough to go to the island to retrieve the footage. 
 %
 It takes Chuck Norris 20 minutes to watch 60 Minutes. 
@@ -284,7 +293,10 @@ In a recent survey it was discovered the 94% of American women lost their virgin
 Chuck Norris invented a language that incorporates karate and roundhouse kicks. So next time Chuck Norris is kicking your ass, don't be offended or hurt, he may be just trying to tell you he likes your hat. 
 %
 If at first you don't succeed, you're not Chuck Norris. 
+<<<<<<< HEAD
 %
+=======
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 If Chuck Norris were a calendar, every month would be named Chucktober, and every day he'd kick your ass. 
 %
 Fear is not the only emotion Chuck Norris can smell. He can also detect hope, as in "I hope I don't get a roundhouse kick from Chuck Norris." 
@@ -353,7 +365,11 @@ As President Roosevelt said: "We have nothing to fear but fear itself. And Chuck
 %
 Chuck Norris just says "no" to drugs. If he said "yes", it would collapse Colombia's infrastructure. 
 %
+<<<<<<< HEAD
 Since 1940, the year Chuck Norris was born, roundhouse-kick related deaths have increased 13,000 percent.? 
+=======
+Since 1940, the year Chuck Norris was born, roundhouse-kick related deaths have increased 13,000 percent.  
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 %
 Crime does not pay - unless you are an undertaker following Walker, Texas Ranger, on a routine patrol. 
 %
@@ -501,8 +517,12 @@ When Chuck Norris works out on the Total Gym, the Total Gym feels like it's been
 %
 Chuck Norris can skeletize a cow in two minutes. 
 %
+<<<<<<< HEAD
 The only sure things are Death and Taxes, and when Chuck Norris goes to work for the IRS, they'll be the same thing.
 %
+=======
+The only sure things are Death and Taxes?and when Chuck Norris goes to work for the IRS, they'll be the same thing.
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 Chuck Norris' first job was as a paperboy. There were no survivors. 
 %
 With the rising cost of gasoline, Chuck Norris is beginning to worry about his drinking habit. 
@@ -533,6 +553,11 @@ Noah was the only man notified before Chuck Norris relieved himself in the Atlan
 %
 Chuck Norris once invited all of the other badasses from TV to duke it out in order to see who was the supreme badass. Only two showed up-- Jack Bauer and MacGyver. 
 %
+<<<<<<< HEAD
+=======
+
+%
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 MacGyver immediately tried to make a bomb out of some Q-Tips and Gatorade, but Chuck Norris roundhouse-kicked him in the solar plexus. MacGyver promptly threw up his own heart. 
 %
 Jack Bauer tried to use his detailed knowledge of torture techniques, but to no avail: Chuck Norris thrives on pain. Chuck Norris then ripped off Jack Bauer's arm and beat him to death with it. Game, set, match. 

plugins/coffee/README.md

@@ -11,7 +11,11 @@ Preview the compiled result of your coffeescript with `cf "code"` as per the
 following:
 
 ```zsh
+<<<<<<< HEAD
 $ cf 'if a then b else c'
+=======
+$ cf 'if a then be else c'
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 if (a) {
   b;
 } else {

plugins/coffee/coffee.plugin.zsh

@@ -10,7 +10,11 @@ cfc () {
 }
 
 # compile from clipboard & print
+<<<<<<< HEAD
 alias cfp='cf "$(clippaste)"'
+=======
+alias cfp='coffeeMe "$(clippaste)"'
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 
 # compile from clipboard and copy to clipboard
 alias cfpc='cfp | clipcopy'

plugins/git-extras/git-extras.plugin.zsh

@@ -302,7 +302,11 @@ zstyle ':completion:*:*:git:*' user-commands \
     count:'count commits' \
     create-branch:'create local and remote branch' \
     delete-branch:'delete local and remote branch' \
+<<<<<<< HEAD
     delete-merged-branches:'delete merged branches'\
+=======
+    delete-merged-brancees:'delete merged branches'\
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
     delete-submodule:'delete submodule' \
     delete-tag:'delete local and remote tag' \
     effort:'display effort statistics' \

plugins/gradle/gradle.plugin.zsh

@@ -1,6 +1,10 @@
 #!zsh
 ##############################################################################
+<<<<<<< HEAD
 # A descriptive listing of core Gradle commands
+=======
+# A descriptive listing of core Gradle commands 
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 ############################################################################
 function _gradle_core_commands() {
     local ret=1 state
@@ -32,15 +36,23 @@ function _gradle_arguments() {
     '--stop[Stop the Gradle daemon]' \
     '--daemon[Use the Gradle daemon]' \
     '--no-daemon[Do not use the Gradle daemon]' \
+<<<<<<< HEAD
     '--rerun-task [Specifies that any task optimization is ignored.]' \
     '-i[Log at the info level]' \
     '-m[Dry run]' \
     '-P[Set a project property]' \
     '-p[Specifies the start directory]' \
+=======
+    '--no-opt[Do not perform any task optimization]' \
+    '-i[Log at the info level]' \
+    '-m[Dry run]' \
+    '-P[Set a project property]' \
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
     '--profile[Profile the build time]' \
     '-q[Log at the quiet level (only show errors)]' \
     '-v[Print the Gradle version info]' \
     '-x[Specify a task to be excluded]' \
+<<<<<<< HEAD
     '-b[Specifies the build file.]' \
     '-c[Specifies the settings file.]' \
     '--continue[Continues task execution after a task failure.]' \
@@ -48,6 +60,8 @@ function _gradle_arguments() {
     '-I[Specifies an initialization script.]' \
     '--refresh-dependencies[Refresh the state of dependencies.]' \
     '-u[Don''t search in parent directories for a settings.gradle file.]' \
+=======
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
     '*::command:->command' \
     && return 0
 }

plugins/pyenv/pyenv.plugin.zsh

@@ -17,11 +17,15 @@ for pyenvdir in "${pyenvdirs[@]}" ; do
         FOUND_PYENV=1
         export PYENV_ROOT=$pyenvdir
         export PATH=${pyenvdir}/bin:$PATH
+<<<<<<< HEAD
         eval "$(pyenv init - zsh)"
 
         if pyenv commands | command grep -q virtualenv-init; then
             eval "$(pyenv virtualenv-init - zsh)"
         fi
+=======
+        eval "$(pyenv init --no-rehash - zsh)"
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 
         function pyenv_prompt_info() {
             echo "$(pyenv version-name)"

plugins/rails/rails.plugin.zsh

@@ -42,7 +42,10 @@ alias rp='rails plugin'
 alias ru='rails runner'
 alias rs='rails server'
 alias rsd='rails server --debugger'
+<<<<<<< HEAD
 alias rsp='rails server --port'
+=======
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 
 # Rake aliases
 alias rdm='rake db:migrate'

plugins/rake-fast/rake-fast.plugin.zsh

@@ -8,7 +8,21 @@ _rake_refresh () {
 }
 
 _rake_does_task_list_need_generating () {
+<<<<<<< HEAD
   [[ ! -f .rake_tasks ]] || [[ Rakefile -nt .rake_tasks ]]
+=======
+  if [ ! -f .rake_tasks ]; then return 0;
+  else
+    if [[ "$OSTYPE" = darwin* ]]; then
+      accurate=$(stat -f%m .rake_tasks)
+      changed=$(stat -f%m Rakefile)
+    else
+      accurate=$(stat -c%Y .rake_tasks)
+      changed=$(stat -c%Y Rakefile)
+    fi
+    return $(expr $accurate '>=' $changed)
+  fi
+>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
 }
 
 _rake_generate () {