change theme
Merge branch 'master' of https://github.com/mluckeneder/dotfiles

* 'master' of https://github.com/mluckeneder/dotfiles:
  added some git things
  updated prompt

Conflicts:
	zsh/theme.zsh
removed ruby prompt