Merge pull request #1674 from simeonwillbanks/master

Fixes #1485 Zeus should not be bundled
Merge pull request #1662 from rylwin/patch-1

last-working-dir: Use >! to overwrite $cache_file
Merge pull request #1690 from docwhat/git-untracked

This fixes checking for git untracked items
Merge pull request #1686 from timsly/hub-autocomplete

added hub autocomplete instructions
Merge pull request #1685 from justinclayton/patch-1

Update _vagrant
Merge pull request #1681 from akre54/add-bower

add bower autocompletion
Merge pull request #1680 from zbrox/master

Powify autocomplete
Merge pull request #1679 from KokaKiwi/master

A new plugin "colored-man" and a greeny theme "kiwi"
Merge pull request #1665 from bmcorser/patch-1

Alias for commit and commit all with amend
Merge pull request #1656 from hacfi/patch-2

Autocomplete composer default methods if composer.json is not available
Merge pull request #1655 from nubs/phing-and-cache-files

Improve portability of cache file detection for command targets
Merge pull request #1654 from bertag/parse-git-dirty-support-for-1.6

parse_git_dirty() support for Git 1.6
Merge pull request #1652 from z2v/master

Add useful aliases accompanying 'push/pull' activites
Merge pull request #1632 from jmatth/tmux_plugin

Adding Tmux Plugin
005d967dc4e879f304607a706ccd18886e630dc1
Merge pull request #729 from doitian/plugin_tmuxinator

tmuxinator completion
Merge pull request #1060 from danielbayerlein/new-theme-inspired-by-peepcode

Add Theme "itchy"
Merge pull request #1208 from jaischeema/master

Add new theme : jaischeema
Add emoji-clock plugin

which displays the current time with half hour accuracy as an emoji
symbol, for example in the shell prompt.
"$PWD" = "PWD", >! doesn't work, echo is redundant. Fixed all.