Bumping .emacs.d with ruby fix.
Bumped .emacs.d pointer.
Bump oh-my-zsh pointer fix up .path.
Merge remote-tracking branch 'origin/master' into yelp

* origin/master:
  Bump oh-my-zsh pointer fix up .path.
  Bumped .emacs.d pointer.
  Bumping .emacs.d with ruby fix.

Conflicts:
	.emacs.d
	oh-my-zsh