Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
added pj.plugin
add alias for rspec to zeus plugin
Merge pull request #1586 from HeroicEric/master

add rspec alias to zeus plugin
Fix rbenv gems helper

Fixes gem versions with words (beta, pre) in the version or with
multiple installed versions not being highlighted, and compatibility
with GNU sed (related to robbyrussell/oh-my-zsh#1579).
Merge pull request #1583 from To1ne/pj.plugin

added pj.plugin
Merge pull request #1594 from jbhannah/rbenv-gems-fix

Fix rbenv gems helper
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
added michelebologna theme
added comment for auto-generated hostname color
Merge pull request #1645 from mbologna/master

a new theme, different from the already existent themes :)
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
correcti_all => correct by default
Adds "gds"
Merge remote-tracking branch 'plalloni/master'

Conflicts:
	plugins/git/git.plugin.zsh