Squashed 'oh-my-zsh/' changes from 0178527..a021ed7

a021ed7 Merge remote-tracking branch 'robbyrussell/master'
d05b201 Merge pull request #1229 from seban/run_rails_without_bundle_exec
1c23a52 auto-upadate feature will now reset the epoch so that if a user doesn't say yes, it won't ask them again for a while. fixes #1240
87ab877 'rails' command should not be run with bundle exec
1103421 Merge pull request #1200 from andyfleming/master
11f441a Merge pull request #1206 from Eustachy/upstream
ddafaf6 Merge pull request #1216 from joshvermaire/patch-1
a15bcd6 utilize sublime's embedded command line binary
92b6cae escape whitespace
0370de5 Merge pull request #1122 from varunkvv/master
76feafc Merge pull request #1127 from a-b/master
e5ca18a Merge pull request #1193 from bameda/master
f3bcf86 Merge pull request #1209 from lwe/rbfu-plugin
beadefc Merge pull request #1170 from dipth/master
e3ff4b5 provide plugin for rbfu the ruby version switcher
e2ddf1e Remove bogus "-" from nomz="ps -aux" alias.
34f3d4d Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
d15ec4b Added another path
d165a84 Merge pull request #1190 from vpacher/master
1425ffe Merge pull request #1192 from rcakirerk/a39c9ffe5b7236b6e4dc78efa80b478cc411af7f
a39c9ff Fix finding git issue. http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script
5c37c85 added jexec
3aa0cb7 added plugin for jruby
3ac3141 Merge pull request #1174 from insside/rbenv-homebrew-fix
493238e Merge pull request #1126 from natsumesou/fix-ignore-symlink
a269563 Merge pull request #1182 from jugyo/patch-1
bf98a2d Merge pull request #1159 from kristi/master
470e1a1 Merge pull request #1173 from walkah/virtualenvwrapper-osx-fix
17c77ee Merge pull request #1168 from r-darwish/yum-plugin-fix
7e1da28 correct the ruby version label for rbenv
98d7a01 theme cleanup
b97cc93 added first version of my theme af-magic
5931f64 sanitized code according to coding style
e9a9dea rbenv plugin now uses 'brew --prefix rbenv' command to find rbenv folder
82f785b remove readlink call and clean up
4a2e9ed Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
823cc91 Explicitly tell rbenv to use zsh
c65a53d Fixed unmached " in yum plugin
e8d582a Merge pull request #977 from scialex/better-d
e3d426d Merge pull request #980 from vmalloc/dircycle_plugin
38d537f Merge pull request #984 from vmalloc/less_r_pager
b84d336 Merge pull request #985 from pomaxa/master
f60244f Merge pull request #999 from ChaosData/master
7bb2744 Merge pull request #1016 from fuksito/master
edc8b1e Merge pull request #1032 from r-darwish/suse
7d9ae4c Merge pull request #1055 from daniellockard/patch-1
d297524 Merge pull request #1065 from ntpeters/patch-1
4d6b532 add --directory flag
00c8e33 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
4199c1a Updating README to ask people to stop sending themes for now
33b7f22 Merge pull request #1148 from erichmenge/git-flow-plugin
e6c81a5 Merge pull request #1019 from matschaffer/patch-1
dee54a2 Use grep to detect if untracked files exist instead of storing all the output of ls-files.
feb11a7 Merge pull request #239 from fred-o/master
21de917 Merge pull request #1146 from westonplatter/master
2946630 Merge pull request #1152 from mispy/virtualenvwrapper
577d8a9 Merge pull request #1155 from s3dev/s3dev
c669868 Merge pull request #1145 from tjl2/master
57279ec Merge pull request #1156 from thackoun/master
37bce2b fix a very minor bug with colors of parenthesis in the terminalparty theme
1bb7159 Change hardcoded ~/.oh-my-zsh to $ZSH.
61ceec5 Plugin which loads Python virtualenvwrapper and activates virtualenvs on cd into git repos
477e81e Merge branch 'master' of github.com:westonplatter/oh-my-zsh
083cff4 checking if airport allows git protocol
73b9f83 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
df30eae Add a couple of options for git-flow.
a04484e rails3, added rgm = 'rails generate migration'
c4608ba Removing ey command from bundled_commands. It is not usually bundled.
caa1554 Merge pull request #1138 from amarraja/master
48c9e77 Merge pull request #1140 from mappleconfusers/pull_req_debian
91b4758 Now with 50% less auto-updates.
0673425 Add command to directly install the output of acs
1876f1d Make the $apt_pref variable evaluatet at alias expansion by using single-quotes instad of double quotes
8de877d Prevent the heroku command from being automatically bundle-exec'ed The heroku command should not be executed via bundler, see: https://github.com/heroku/heroku/issues/173
8923694 Fixed a bug in checking the platform
548f68d fino-time theme
0f9fff8 add fasd plugin
61c39b5 Load symlink custom files
6f859c5 Add Sublime Text 2 alias for Linux.
b4380aa Added zp and zps aliases for the SUSE plugin
adab18f Added suse plugins
3fdaf26 Merge pull request #1026 from dir01/patch-1
383ee71 Merge pull request #1079 from dylnhdsn/feature/sublime_text_plugin
a36a90b Merge pull request #1105 from Drarok/fix-svn
e6fc2c6 Merge pull request #1111 from jimeh/fix-ZSH_CUSTOM-variable
f9018c5 Load themes from `$ZSH_CUSTOM` instead of `$ZSH/custom`
51c55ad Suppress "zsh: no matches found" error when $ZSH_CUSTOM has no files
e2f7623 Don't drop everything after a trailing slash, as this breaks standard svn branches: ^/branches/featurename ^/releases/Release-vx.y ^/trunk
99a3c3c changed the alias to use to cli provided by sublime text
5eb466a added aliases for sublime text
e429a88 Added yum aliases for: makecache, grouplist, groupinstall, and groupremove.
12e181c Added an if-statement to see if git is installed
a4748a2 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
60c3fa9 Python plugin: added pygrep command, simplified pyclean
5f72c63 Don't clobber standard Esc+. behavior
db27635 Plugin for encoding strings into base64 and decoding them
c7105a5 Disabled title function for emacs term mode
b1e4ef1 current repository action
19bf83e Pager is 'less -R' to support colored outputs
f8802bd Add dircycle plugin: enables cycling through the directory stack
d693711 made the 'd' alias only show the directories that can be cd'ed to using the number aliases
1120f97 Merge pull request #958 from cruser42/master
5a5c93b Fixed bug introduced when fixing issue 896
631e3d8 Merge pull request #868 from wgriffioen/bundler_add_rails
16bdd0c Merge pull request #925 from cruser42/bugfix/gitversionfix
7e5dda7 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
a9f6aed fixed introduced to parse_git_dirty
7ea7588 changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurate
dc4d7a9 fixed asterisk display for modified repos in git prior to 1.7.2
3629270 Merge pull request #666 from szetobo/rails_runner
8769e5f Removed trailing spaces in Git files. Fixes #867
35d89ab update rails runner alias to ru
0da1865 added rails to bundled_commands
9d92987 Merge pull request #663 from gravof/patch-1
512a6e5 Merge pull request #850 from johnantoni/pow-fix
b56e372 Merge pull request #860 from sbfaulkner/rbenv-support-for-themes
9dc9cae Merge pull request #865 from iltempo/patch-1
a26f9b9 adding engine yard command (ey) to bundler binstubs
6496acf adding rbenv support to all the rvm themes
ac910b8 Merge pull request #845 from tjwallace/bundler_plugin_fix
80257bd Merge pull request #717 from blueyed/github-plugin-working-hub
3891c50 Merge pull request #801 from kalos/autojump
3574f30 Merge pull request #811 from markdrago/remove_verbose_mercurial_flags
634ce4e Merge pull request #853 from lepht/master
9863633 Merge pull request #810 from cseeger/master
851aa9c9 Merge pull request #856 from sgharms/patch-1
c725ecc Merge pull request #858 from tatey/bundle_plugin_middleman
e0b2356 Add middleman to bundled commands
62a3ef6 Grammar update
5f95d01 Updated to latest version of taskwarrior completions (using Taskwarrior 2.0b4)
f9b4356 bug : stop creating those ~ directories add powit command to symlink an app if it hasn't been already
3841da1 don't check for tmp dir
36cd5ed add alias to view the standard out (puts) from any pow app
c1a04eb take in csexton's changes
741f674 fix for pow plugin to default to current dir
f4944d5 Merge pull request #721 from gawel/master
51ce4cd Merge pull request #783 from oteyatosys/master
7cb5a5d Merge pull request #830 from dbye/speedup
6822296 Merge pull request #847 from msharp/master
8f1a5d3 added a rake plugin to disable zsh file globbing when calling rake tasks with square brackets
96265d2 fix bundler plugin for root level folders
1a0be15 Merge pull request #840 from arbovm/master
eabd6fa Merge pull request #838 from Bounga/bundled_thor
dc45119 Merge pull request #833 from backspace/patch-1
4b3429d fixing #812: adding plugins w/o plugin.zsh file to fpath.
73c2c8a Add Thor to bundled commands
b73f95a Removed the assignments to fpath as well, since that's all handled in the .oh-my-zsh/oh-my-zsh.sh boot script.
f504102 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
0d99759 Don’t report that Oh My Zsh has been updated when it hasn’t.
c04b4ab Removed calls to compinit in the extract and the bundler plugins. compinit should only be called once, after all modules, libs, etc are imported.
5809a47 check if autojump is installed
7a41498 Merge pull request #784 from lnxbil/967e84ebaa180ad2ab1eebc9a512f94d93e84aea
b7b2dd5 Merge pull request #806 from OutPunk/terminalapp-plugin
ae73533 Kill the compdef; Introduce 'grh' alias for 'git reset HEAD'
a11c814 Merge pull request #816 from lucapette/add-annotate-to-bundler-commands
7a36187 add annotate
804c18c remove the -v flag from a few mercurial aliases
9ac98f6 Git Plugin: adds 'grhh' alias for 'git reset HEAD --hard'
a28b888 Apple Terminal.app resume directory plugin
955825b autojump plugin enhanced
8c45b73 Merge pull request #785 from simonjefford/patch-1
35de0e1 Merge pull request #799 from plindborg/ruby-plugin-fix
a49fcea Fixed the rfind command in the  ruby plugin
5516f8c Merge pull request #790 from cicloid/master
cb50164 Get the Hostname
2176cf3 bundler plugin - don't "bundle exec rails"
967e84e multiple versions could occur and should also be highlighted
e43dd05 Mortal Scumbag Theme
3e9493f Merge pull request #679 from ornicar/official
6bab89a Merge pull request #671 from peterhoeg/31cddcd32427a5f5d3daa0da168d39aba5b510b4
359fe53 Merge pull request #688 from alexstrat/master
ae3f5e4 Merge pull request #693 from dreur/upstream-debian-apt-history
22b9977 Merge pull request #702 from sirech/fix-bundle-compl
2864e42 Merge pull request #710 from moutten/patch-1
7c66c63 Merge pull request #669 from peterhoeg/f/battery
8bc6082 Merge pull request #618 from fceccon/custom-theme
480d124 Updating installation documentation to show a curl example as well for those who don't have wget installed.
c41807c Merge pull request #776 from mytechnix/master
0407eb0 Merge pull request #747 from ilikenwf/1a49f6443c0230b8e182294546ed9ef2a5110bf2
b29602e Merge pull request #764 from Fl4t/submodules
2b86624 Merge pull request #772 from indrajitr/master
723372a Merge pull request #765 from trevor/master
8af3a9a Merge pull request #768 from askreet/master
f8db2e8 Merge pull request #769 from divineforest/master
0ca2e26 Merge pull request #775 from tatey/sammy_black_on_white_theme
f999fd8 Added example aliases in ZSH template. Added a new theme.
59baf39 Black on white theme inspired by Sam Stephenson's terminal screenshot on https://github.com/sstephenson/rbenv
0b58363 Fix upgrade and uninstall functions to pick up $ZSH value
12a0457 Added alias gcm='git checkout master
d852169 Added support for entries in /etc/ssh/ssh_known_hosts.
dd14e07 Ignore submodules dirty in prompt info
a21dc47 add note about custom plugins
54f1758 Merge pull request #752 from andrewtch/symfony2-completion
8c96fa3 Merge pull request #757 from cwjohnston/knife-environments
8ca8d26 Merge pull request #759 from Zhann/master
a62d227 show gemset next to ruby version
1ced49b adding support for chef environments in knife plugin
03424fd Symfony 2 completion
82568cc Merge pull request #708 from eatnumber1/update-print
1a49f64 add sprunge.us pastebin uploader - uses files, or pipes
c133f41 Merge pull request #343 from giddie/plugin-wakeonlan
047fcdc Merge pull request #743 from c089/autojump-macports
220eccf Merge pull request #741 from suvash/master
9637d4e Merge pull request #738 from pygatea/master
e711ab8 Merge pull request #733 from Zhann/master
d1b6423 Merge pull request #732 from ggustafsson/patch-1
e25147a Merge pull request #734 from maxpersson/726-pip-completion
11b4769 Merge pull request #709 from docwhat/custom-plugin-fpath
ca21ff1 Merge pull request #707 from gmcmillan/master
a9a0f58 Merge pull request #706 from docwhat/termsupport-hook
d3cc184 Merge pull request #701 from kirs/master
91926dc Merge pull request #553 from benlumley/master
3e7e52a add support for autojump installed via macports
8ca019f Added my own theme file : suvash
d25fb09 forks miloshadzic theme to add more directory info as well as user and host info
e24230c Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
5eae942 Added message when caching packages
1c4997f Added caching of packages
42b0123 Added brute force package completin on install subcommand
7c36ef7 Adding critical security patch to let you all know I'm on top of this shit. add 'nyan' to your plugins... then run  for security upgrade.
b16099f Added Zhann theme. Based on Robbyrussel theme, but shows the current ruby version and has some color variations.
3fc812a Removed duplicate setting and sorted the remaining
31badac Jake-node plugin : update - remove the need to write a `jake_tasks` in the directory - use most recent usage of completion with zsh - tested for MacOSX and Ubuntu
5260bfd allow django-manage completion. http://pypi.python.org/pypi/DjangoDevKit
2c660c1 Only alias git=hub if `hub --version` works.
10618f3 Add the --format tag to knife list commands
258457e Moved ZSH_CUSTOM declaration before fpath is set
3512eca set fpath correctly for custom plugins
7ec2dd9 Use printf rather than echo -e in update.sh
4173ba1 Added option to disable the update prompt. Set DISABLE_UPDATE_PROMPT to true to enable.
5277a0f Added add-zsh-hook support to themes
40c47a7 lib/termsupport now uses add-zsh-hook
444145b FIX: commands like ruby and rake where not being completed
419ffdc Rails Migrations support
452f121 Add apt-history to debian plugin
456993e minor modifications in comment header (the revenge)
a78387c Minor modifications in comment-header
0f13387 Added completion plugin for jake
a2afcca Add yaourt --sucre alias in archlinux plugin
31cddcd fix: rbenv: I need to find a proper way to test changes...
a5545bd add: rbenv plugin
6095fe4 add: battery plugin
81d94e6 add rails runner alias
7553d01 Replace "git-diff" with "git diff" in the git plugin
757fa33 Merge pull request #505 from masnick/master
b8ade48 Merge pull request #529 from dbb/master
03fc819 Merge pull request #552 from Tricon/master
833c856 Merge pull request #579 from hakanensari/bundler-plugin-patch
dfc7319 Merge pull request #594 from sirech/fix-bundle-compl
cceb387 Merge pull request #595 from zachriggle/grails-plugin
0fe2462 Merge pull request #554 from toolbear/549-fix-auto-upgrade
167f84d Merge pull request #607 from vddgil/patch-1
c5e6dbf Merge pull request #613 from rkj/master
15d7a4c Merge pull request #614 from philippbosch/feature/terminitor-plugin
85fd141 Merge pull request #622 from foozmeat/master
ebd0523 Merge pull request #626 from nickstenning/upstream
72adfb6 Merge pull request #631 from danshearmur/git-merge-alias
57f04b9 Merge pull request #645 from mr-szymanski/master
1228638 Merge pull request #648 from SFEley/d926a55872b5a12ab8b987e9d86c02358d0c825e
26b20e2 Merge pull request #418 from ptrv/master
11a0c33 Merge pull request #441 from Gonzih/master
cc82ac1 Merge pull request #273 from blueyed/hub-alias-only-with-ruby
490177d Merge pull request #225 from Soliah/plugin-bundler
7b6b6f1 Merge pull request #205 from sorin-ionescu/plugin-gnu-utils
84c20ce Merge pull request #482 from volpino/master
e91e384 Merge pull request #428 from matthewmccullough/gradleplugin
e59a9cb Merge pull request #338 from norm2782/master
6cc4389 Merge pull request #319 from sorin-ionescu/plugin-npm
1ab0054 Merge pull request #275 from tristan0x/require_tool
6e8c0c1 Merge pull request #274 from diofeher/master
14bb310 Merge pull request #525 from kibs/master
c373c71 Fix up some wonkiness
40cc4da Add new theme: wuffers
c1c7b0e added git merge as gm
8287cc1 Better cake completion: don't barf on options, and don't clobber user's namespace
b2703a3 This is the correct way to check the return value
c2d0cdd This needs to explicitly check the return value
2ca2ad3 First search in the custom folder for the theme
7ba54d1 Adding README file for the wakeonlan plugin
d22b253 split rkj into two themes.
e94039d Splitting wakeonlan plugin completion into separate file
aa7ddd5 Forgot to quote the path parameter to wakeonlan
14411cb Tweaks to the wakeonlan plugin
0d285e3 terminitor plugin: add autocompletion also for edit, delete and setup subcommands.
47d0735 terminitor plugin: add autocompletion for start subcommand.
1ad8fde Add basic autocompletion for terminitor (https://github.com/achiu/terminitor).
2b55ee0 Merge branch 'master' of http://github.com/robbyrussell/oh-my-zsh
701f775 Textmate plugin update to take Gemfile and cucumber features in account
ecfac1c Added VCS prompt to Apple theme.
f9c143b [plugins/grails] Remove warning message; it's always displayed
5173634 [plugins/grails] Use globbing instead of grep
c6e8c85 [plugins/grails] Added grails plugin
965e1cf fix completion for commands wrapped with bundler
8a31ae5 Merge branch 'master' of github.com:Gonzih/oh-my-zsh
fe17566 vundle call fixed for new vundle version
ee507c9 add foreman, nanoc, and rainbows to list of bundled commands
9c5c70d order aliases alphabetically
c113e88 Fix auto upgrade failure from non-exported ZSH env var
bf2c55a Gallois theme - made the git branch/status show for those of us without rvm
85f388f Added nifty purple Apple theme.
d3116d4 Remove -s switch from apt-copy
7a89786 oops, restore broken theme preview
4dc11fe detect rvm or rbenv and show ruby version
c2a95b7 Added a gradle build tool plugin
65393b4 Extend root ops, switch apt-copy to plain zsh
fac7401 Add options for su(do) and apt(itude|-get)
8c48f10 Add functions for new GH repos.
8ed6dd5 Add functions for new GH repos.
fd55d53 Fix su commands
749feb2 Merge "deb" and "debian" plugins.
3780247 added option of setting another path to custom plugins and files
cbf6627 fixed theme chooser + options + list available themes + show all themes
f35bfd9 Add fino.zsh-theme
d15d3a5 global zsh config
76dd2d8 mac os fix
5d5d2f9 fox's theme + theme chooser fixes
fea4e54 added theme chooser
053cb24 added tip about vundle configutarion after git clone
499819c vundle plugin refactored first it checks existens of vundle plugin, if plugin dont exist run git clone
7ef7ffc removing useless line
a335e9d plugin for vundle (vim plugins managment system) that provide vundle, vundle-update and vundle-init aliases
929c64e Create gnzh theme
55eda0c Added mercurial plugin with aliases.
bf86502 Added gnu-utils plugin.
5aa6b0f Replaced npm 0.x completion with 1.0 completion.
8454542 Update, no more full path
1d9eacb Plugin to make WOL nice & easy
e199e1d Add norm theme
f71647f Merge branch 'master' of http://github.com/robbyrussell/oh-my-zsh
0a89611 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
b2d5b43 refactored pycrm command
0c032aa Removing master stuff
df0b37f Merge branch 'master'; commit 'ca4dabb45e14d8cd38e07c4ffadf9473ceb2193b' into require_tool
2fba448 Add new plugin emacs, to take benefit of daemon capabilities of emacs >=23
bbf1f87 Fix version parsing. Now working with command $ zsh --version
ca4dabb New tool require_tool.sh
d6c150d adding python plugin with some aliases
14a1877 New plugin git-svn installing git project git-svn-clone-externals
911837c github plugin: check for `ruby`.
9092bf7 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
f61a395 Merge ssh://spix-dev01/home/fredrik/.oh-my-zsh
f1af415 figuring out home dir on unix systems as well
0294487 Merge branch 'master' of github.com:fred-o/oh-my-zsh
da0cc37 Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
d807221 fix to avoid parse errors if $TERM is empty
0664370 Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
c2e8bed Added a plugin for GNU Screen.
0504a01 .gitignore
8d18844 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
d537dc8 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
8bf1d8e Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
0858eae Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
d926a55 Refined RVM prompt in Crunch theme
fadd5f7 Crunch theme (by Stephen Eley)
4144f4b Add tab completion to bundler plugin.
dccfdf7 Merge branch 'master' of http://github.com/robbyrussell/oh-my-zsh
48ab2ad no hg & git status (sloooow)
bbde258 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
792e50c mvn plugin
63de788 Merge branch 'master' of github.com:fred-o/oh-my-zsh
3e260a9 Merge branch 'master' of http://github.com/robbyrussell/oh-my-zsh
d02a391 maven plugin
57e0b57 changes
fb6fddd Merge branch 'master' of http://github.com/robbyrussell/oh-my-zsh
f294eeb added rkj theme - xion-chiamiov-plus + hg from thomasjbradley

git-subtree-dir: oh-my-zsh
git-subtree-split: a021ed7c3332dae0081ef21ae7b68ec56a38dd77
Merge commit 'f3cbb7fd639075139a9aeb5471794f25d8606cef'