Merge pull request #732 from ggustafsson/patch-1

Removed duplicate setting and sorted the remaining
Merge pull request #733 from Zhann/master

Pull request for zhann theme
Merge pull request #738 from pygatea/master

Adds pygmalion.zsh_theme
Merge pull request #741 from suvash/master

Added my own theme for submission
Merge pull request #743 from c089/autojump-macports

add support for autojump installed via macports
Merge pull request #343 from giddie/plugin-wakeonlan

Plugin to make WOL nice & easy
Fixes and improves the behavior of the tm command
Merge remote branch 'upstream/master'
add sprunge.us pastebin uploader - uses files, or pipes
Only `setopt correct`, not "correct_all".

Using the correct_all option is too distracting, and needs a lot of
`nocorrect` aliases to work around this.

Using only "correct" to correct the command itself is more friendly.
Merge pull request #708 from eatnumber1/update-print

Use printf rather than echo -e in update.sh
Symfony 2 completion
adding support for chef environments in knife plugin
show gemset next to ruby version
Merge pull request #759 from Zhann/master

show gem set next to ruby version
Merge pull request #757 from cwjohnston/knife-environments

Add support for chef environments in knife plugin
Merge pull request #752 from andrewtch/symfony2-completion

Symfony 2 completion
add note about custom plugins
Ignore submodules dirty in prompt info
Added support for entries in /etc/ssh/ssh_known_hosts.