bump pointers.
Added ssh-socket finding to .functions. This should fix tmux issues.
Merge remote-tracking branch 'origin/master' into yelp

* origin/master:
  Added ssh-socket finding to .functions. This should fix tmux issues.
  bump pointers.

Conflicts:
	.emacs.d
	oh-my-zsh