Don't show a version if rbenv can't switch to it
Fixed syntax error
Merge pull request #94 from OmeGak/fix-e

Fixed syntax error
Fix seds treatment of tabs

Per https://github.com/holman/dotfiles/commit/3d2a856d2475f8c7e6cff6117652f92542cb6247#commitcomment-3561553.
Merge pull request #95 from boaf/tab-character-fix

Fix sed's treatment of tabs
Un-ignore Ctrl-D
Merge remote-tracking branch 'upstream/master'

Conflicts:
	zsh/prompt.zsh