Update dotfiles
Re-pin oh-my-zsh
Merge branch 'master' of github.com:jdao/dotfiles

Conflicts:
	oh-my-zsh