Resolving conflict in merge of #1313
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
Merge pull request #1273 from ystein/master

Typo in cd-wrapper
Merge pull request #1247 from drnic/git-cmds

Added 'gcl'for 'git config --list'; and gd for 'git diff'
Merge pull request #1186 from r-darwish/history

Added history plugin
Merge pull request #1189 from petemounce/yum-quote

Fix mismatched quote in yum plugin
Merge pull request #1181 from paulmars/master

Plugin for git_remote_branch autocomplete.
Merge pull request #880 from darrenclark/fix-mac-terminal-app-echo-issue

Fixed Mac OS X Terminal.app related issue with extra newlines echoed
Merge pull request #875 from ttddyy/prompt_git-remove

prompt git-rm as deleted
Merge pull request #794 from markdrago/cloud_parameter

add ability to set custom prefix for cloud theme
Merge pull request #778 from rschmukler/plugin-osx

Added vsplit_tab and split_tab for iTerm.
Merge pull request #1258 from caio/git-branch-status

Add branch status support to git_prompt_status
Merge pull request #1248 from grahamc/add-symfony

Adding a symfony plugin, for symfony 1
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
Added a `migrate` alias.

It migrates the DB and prepares the test DB.
Unset `config_file` variable in oh-my-zsh.sh

`config_file` variable will mess up with `cd` auto-complete command.

eg. I have a local dir named `Code`, and when I type `cd co<Tab>`,
config_file will show up, and doesn't make any sense...
Merge pull request #1468 from larrylv/unset-config-file-variable

Unset `config_file` variable in oh-my-zsh.sh
Merge pull request #1467 from timothyandrew/patch-1

Added a `migrate` alias.
Merge pull request #1233 from mugenken/knife-check-cwd

check for knife.rb in cwd
Merge pull request #1139 from mappleconfusers/pull_req_git

Add aliases for git-remote