Colt made me do it.
Merge branch 'master' of github-through-teton:leifwickland/dotfiles