Merge branch 'disable_auto-title' of https://github.com/lorrin/oh-my-zsh into lorrin-disable_auto-title

github uses a wildcard certificate which is not accepted by wget

Was causing iTerm title to disappear entirely..

This reverts commit d4ea399b.

Merge branch 'ssh-agent-append-host-to-environment' of https://github.com/trcjr/oh-my-zsh into trcjr-ssh-agent-append-host-to-environment

Merge branch 'osx-terminal-title' of https://github.com/curiousstranger/oh-my-zsh into curiousstranger-osx-terminal-title

Merge branch 'feature/alias-completion' of https://github.com/shadowhand/oh-my-zsh into shadowhand-feature/alias-completion

doesn't support tabs titles.

Merge branch 'theme-sorin' of https://github.com/sorin-ionescu/oh-my-zsh into sorin-ionescu-theme-sorin

fixed typo in rails3 plugin and added one alias for migrating and redoing migration if it was successful